Inject CanAddURLToHistory into TopSitesImpl

components/history/core/browser/history_backend.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/history_backend.h"
 
 #include <algorithm>
 #include <functional>
 #include <list>
 #include <map>
@@ skipping 1589 matching lines @@
   // replace it.
   bool bitmap_identical = false;
   bool replaced_bitmap = false;
   for (size_t i = 0; i < bitmap_id_sizes.size(); ++i) {
     if (bitmap_id_sizes[i].pixel_size == pixel_size) {
       if (IsFaviconBitmapDataEqual(bitmap_id_sizes[i].bitmap_id, bitmap_data)) {
         thumbnail_db_->SetFaviconBitmapLastUpdateTime(
             bitmap_id_sizes[i].bitmap_id, base::Time::Now());
         bitmap_identical = true;
       } else {
+        // Expire the favicon bitmap because sync can provide incorrect
+        // |bitmap_data|. See crbug.com/474421 for more details. Expiring the
+        // favicon bitmap causes it to be redownloaded the next time that the
+        // user visits any page which uses |icon_url|.
         thumbnail_db_->SetFaviconBitmap(bitmap_id_sizes[i].bitmap_id,
-                                        bitmap_data, base::Time::Now());
+                                        bitmap_data, base::Time());
         replaced_bitmap = true;
       }
       break;
     }
   }
 
   // Create a vector of the pixel sizes of the favicon bitmaps currently at
   // |icon_url|.
   std::vector<gfx::Size> favicon_sizes;
   for (size_t i = 0; i < bitmap_id_sizes.size(); ++i)
@@ skipping 1013 matching lines @@
   return true;
 }
 
 HistoryClient* HistoryBackend::GetHistoryClient() {
   if (history_client_)
     history_client_->BlockUntilBookmarksLoaded();
   return history_client_;
 }
 
 }  // namespace history