Inject CanAddURLToHistory into TopSitesImpl

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 1125 matching lines @@
   const char kRenameFaviconsTable[] =
       "ALTER TABLE favicons RENAME TO old_favicons";
   const char kCopyFavicons[] =
       "INSERT INTO favicons (id, url, icon_type) "
       "SELECT mapping.new_icon_id, old.url, old.icon_type "
       "FROM old_favicons AS old "
       "JOIN temp.icon_id_mapping AS mapping "
       "ON (old.id = mapping.old_icon_id)";
   const char kDropOldFaviconsTable[] = "DROP TABLE old_favicons";
 
+  // Set the retained favicon bitmaps to be expired (last_updated == 0).
+  // The user may be deleting their favicon bitmaps because the favicon bitmaps
+  // are incorrect. Expiring a favicon bitmap causes it to be redownloaded when
+  // the user visits a page associated with the favicon bitmap. See
+  // crbug.com/474421 for an example of a bug which caused favicon bitmaps to
+  // become incorrect.
   const char kRenameFaviconBitmapsTable[] =
       "ALTER TABLE favicon_bitmaps RENAME TO old_favicon_bitmaps";
   const char kCopyFaviconBitmaps[] =
       "INSERT INTO favicon_bitmaps "
       "  (icon_id, last_updated, image_data, width, height, last_requested) "
-      "SELECT mapping.new_icon_id, old.last_updated, "
-      "    old.image_data, old.width, old.height, old.last_requested "
+      "SELECT mapping.new_icon_id, 0, old.image_data, old.width, old.height,"
+      "    old.last_requested "
       "FROM old_favicon_bitmaps AS old "
       "JOIN temp.icon_id_mapping AS mapping "
       "ON (old.icon_id = mapping.old_icon_id)";
   const char kDropOldFaviconBitmapsTable[] =
       "DROP TABLE old_favicon_bitmaps";
 
   // Rename existing tables to new location.
   if (!db_.Execute(kRenameIconMappingTable) ||
       !db_.Execute(kRenameFaviconsTable) ||
       !db_.Execute(kRenameFaviconBitmapsTable)) {
@@ skipping 209 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