Taskbar runtime profile badge should not use Incognito icon.

This CL changes the taskbar profile badge to use the profile's avatar
icon when the browser window is OTR.

This is necessary because the profile badge needs to match the shortcut
that is pinned to the taskbar, which won't use the incognito icon.

Previously, the taskbar badge would be dependent on the
OTR status of the last browser window to be opened.

BUG=318652

Review URL: https://codereview.chromium.org/71653004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235587 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 235587
rAc: remove obsolete prefs

BUG=293917

Review URL: https://codereview.chromium.org/73473002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235588 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 235588