Extend HistoryService with support for favicons from Google servers

components/history/core/browser/history_service.cc

Index: components/history/core/browser/history_service.cc
diff --git a/components/history/core/browser/history_service.cc b/components/history/core/browser/history_service.cc
index b154b3237e19b1373d1c0ba522aefc8229a51861..29925d65bcb41aedb482ec045a5bf0d5a4510517 100644
--- a/components/history/core/browser/history_service.cc
+++ b/components/history/core/browser/history_service.cc
@@ -625,6 +625,24 @@ void HistoryService::SetFavicons(const GURL& page_url,
                           page_url, icon_type, icon_url, bitmaps));
 }
 
+void HistoryService::SetExpiredFaviconsIfNoneKnown(

[brettw, 2017/03/20 21:37:31]

This name is hard to make sense of without understanding the details of this
change. How about "SetLastResortFavicons"? Then the whole behavior of setting
the expired bit can be an implementation detail of how a "last resort" favicon
is defined.

+    const GURL& page_url,
+    favicon_base::IconType icon_type,
+    const GURL& icon_url,
+    const std::vector<SkBitmap>& bitmaps,
+    base::Callback<void(bool)> callback) {
+  DCHECK(backend_task_runner_) << "History service being called after cleanup";
+  DCHECK(thread_checker_.CalledOnValidThread());
+  if (history_client_ && !history_client_->CanAddURL(page_url))
+    return;
+
+  PostTaskAndReplyWithResult(
+      FROM_HERE,
+      base::Bind(&HistoryBackend::SetExpiredFaviconsIfNoneKnown,
+                 history_backend_, page_url, icon_type, icon_url, bitmaps),
+      callback);
+}
+
 void HistoryService::SetFaviconsOutOfDateForPage(const GURL& page_url) {
   DCHECK(backend_task_runner_) << "History service being called after cleanup";
   DCHECK(thread_checker_.CalledOnValidThread());