Save large icons to a new LARGE_ICON type

components/history/core/browser/thumbnail_database.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/history/core/browser/thumbnail_database.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 642 matching lines @@
         bitmap_count.Step() ? bitmap_count.ColumnInt(0) : 0);
   }
 
   // Count "touch" icon URLs referenced by the DB.
   {
     sql::Statement touch_icon_count(
         db_.GetCachedStatement(
             SQL_FROM_HERE,
             "SELECT COUNT(*) FROM favicons WHERE icon_type IN (?, ?)"));
     touch_icon_count.BindInt64(0, favicon_base::TOUCH_ICON);
-    touch_icon_count.BindInt64(0, favicon_base::TOUCH_PRECOMPOSED_ICON);
+    touch_icon_count.BindInt64(1, favicon_base::TOUCH_PRECOMPOSED_ICON);

[huangs, 2015/05/04 05:17:30]

This looks like an independent bug fix. I'd recommend having this as a separate
CL, and having it sped through the review process.  Also please see how this
changes UMA, and ping michaelbai@ (or whoever wrote this).

[Roger McFarlane (Chromium), 2015/05/04 18:48:15]

Moved to a separate CL.

This is a new histogram I added a couple of weeks back. This was just an error
that made it through review. No one else is consuming this histogram yet.

     UMA_HISTOGRAM_COUNTS_10000(
         "History.NumTouchIconsInDB",
         touch_icon_count.Step() ? touch_icon_count.ColumnInt(0) : 0);
   }
 
   // Count "large" bitmap resources cached in the DB.
   {
     sql::Statement large_bitmap_count(
         db_.GetCachedStatement(
             SQL_FROM_HERE,
@@ skipping 704 matching lines @@
   meta_table_.SetVersionNumber(8);
   meta_table_.SetCompatibleVersionNumber(std::min(8, kCompatibleVersionNumber));
   return true;
 }
 
 bool ThumbnailDatabase::IsFaviconDBStructureIncorrect() {
   return !db_.IsSQLValid("SELECT id, url, icon_type FROM favicons");
 }
 
 }  // namespace history