Bypass the favicon_service when importing favicons.

chrome/browser/history/history_service.cc

Index: chrome/browser/history/history_service.cc
diff --git a/chrome/browser/history/history_service.cc b/chrome/browser/history/history_service.cc
index 13713c88099d8fe7ef5dd658921fe34340c91978..377e4efca5294a22e5f5fa9e82fb13b75d98df4b 100644
--- a/chrome/browser/history/history_service.cc
+++ b/chrome/browser/history/history_service.cc
@@ -688,13 +688,6 @@ void HistoryService::CloneFavicons(const GURL& old_page_url,
                     old_page_url, new_page_url);
 }
 
-void HistoryService::SetImportedFavicons(
-    const std::vector<ImportedFaviconUsage>& favicon_usage) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  ScheduleAndForget(PRIORITY_NORMAL,
-                    &HistoryBackend::SetImportedFavicons, favicon_usage);
-}
-
 base::CancelableTaskTracker::TaskId HistoryService::QueryURL(
     const GURL& url,
     bool want_visits,
@@ -714,6 +707,15 @@ base::CancelableTaskTracker::TaskId HistoryService::QueryURL(
           &RunWithQueryURLResult, callback, base::Owned(query_url_result)));
 }
 
+// Importer --------------------------------------------------------------------
+
+void HistoryService::SetImportedFavicons(
+    const std::vector<ImportedFaviconUsage>& favicon_usage) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  ScheduleAndForget(
+      PRIORITY_NORMAL, &HistoryBackend::SetImportedFavicons, favicon_usage);
+}
+
 // Downloads -------------------------------------------------------------------
 
 // Handle creation of a download by creating an entry in the history service's