Allow favicons for synced bookmarks to expire

components/history/core/browser/history_backend.cc

Index: components/history/core/browser/history_backend.cc
diff --git a/components/history/core/browser/history_backend.cc b/components/history/core/browser/history_backend.cc
index faf00c6db8293356065862bd9fdc5e72a72ba4c8..8c08baf2edcfa9cb52e54773ed28cef0f1a7c85e 100644
--- a/components/history/core/browser/history_backend.cc
+++ b/components/history/core/browser/history_backend.cc
@@ -1603,8 +1603,9 @@ void HistoryBackend::MergeFavicon(
   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)) {

[sky, 2015/05/18 17:15:20]

How about a comment as to why this doesn't update the time?

-        thumbnail_db_->SetFaviconBitmapLastUpdateTime(
-            bitmap_id_sizes[i].bitmap_id, base::Time::Now());
+        // TODO: Pass in boolean to MergeFavicon() if any users of
+        // MergeFavicon() want the last_updated time to be updated when the new
+        // bitmap data is identical to the old.
         bitmap_identical = true;
       } else {
         // Expire the favicon bitmap because sync can provide incorrect