Revert of Bypass the favicon_service when importing favicons.

chrome/browser/history/history_service.h

Index: chrome/browser/history/history_service.h
diff --git a/chrome/browser/history/history_service.h b/chrome/browser/history/history_service.h
index 60549b27931f6a49279a6117ccc9881ef65727e6..f6d73b1b3cdb77ae0967983be8db3f9f0f78981d 100644
--- a/chrome/browser/history/history_service.h
+++ b/chrome/browser/history/history_service.h
@@ -379,14 +379,6 @@
   syncer::SyncError ProcessLocalDeleteDirective(
       const sync_pb::HistoryDeleteDirectiveSpecifics& delete_directive);
 
-  // Importer ------------------------------------------------------------------
-
-  // Used by the ProfileWriter for importing many favicons for many pages at
-  // once. The pages must exist, any favicon sets for unknown pages will be
-  // discarded. Existing favicons will not be overwritten.
-  void SetImportedFavicons(
-      const std::vector<ImportedFaviconUsage>& favicon_usage);
-
   // Downloads -----------------------------------------------------------------
 
   // Implemented by the caller of 'CreateDownload' below, and is called when the
@@ -730,6 +722,12 @@
   // provided that other page does not already have favicons.
   void CloneFavicons(const GURL& old_page_url, const GURL& new_page_url);
 
+  // Used by the FaviconService for importing many favicons for many pages at
+  // once. The pages must exist, any favicon sets for unknown pages will be
+  // discarded. Existing favicons will not be overwritten.
+  void SetImportedFavicons(
+      const std::vector<ImportedFaviconUsage>& favicon_usage);
+
   // Sets the in-memory URL database. This is called by the backend once the
   // database is loaded to make it available.
   void SetInMemoryBackend(