Revert 235587 "Taskbar runtime profile badge should not use Inco..."

Speculative revert, will revert this revert or follow-up with more details

> 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

TBR=calamity@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235603 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 235603
Revert 235595 "Revert 235492 "[sql] Recover Favicons v5 database..."

> Revert 235492 "[sql] Recover Favicons v5 databases, with more re..."
> 
> Speculative revert to find the cause for Mac size regression
> (will revert this revert later)
> 
> > [sql] Recover Favicons v5 databases, with more recovery automation.
> > 
> > An entirely automated recovery system runs afoul of questions about
> > whether the corrupt database's schema can be trusted.
> > sql::Recovery::AutoRecoverTable() uses a schema created by the caller
> > to construct the recovery virtual table and then copies the data over.
> > 
> > sql::Recovery::SetupMeta() and GetMetaVersionNumber() simplify
> > accessing meta-table info in the corrupt database.
> > 
> > sql::test::IntegrityCheck() and CorruptSizeInHeader() helpers to
> > simplify common testing operations.
> > 
> > Rewrite ThumbnailDatabase v6 and v7 recovery code and tests using
> > these changes, and add a v5 recovery path.  Additionally handle
> > deprecated versions.
> > 
> > BUG=240396,109482
> > 
> > Review URL: https://codereview.chromium.org/50493012
> 
> TBR=shess@chromium.org
> 
> Review URL: https://codereview.chromium.org/74933002

TBR=kinuko@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235604 0039d316-1c4b-4281-b951-d872f2087c98
[SyncFS] Implement remaining essential NOTIMPLEMENTED on RemoteToLocalSyncer

 * Implement HandleInactiveFile
 * Handle conflict case of add-or-update case
 * Handle reorganize case by deletion

BUG=240165
R=kinuko@chromium.org, nhiroki@chromium.org

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

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