Revert of Bypass the favicon_service when importing favicons.

chrome/browser/favicon/favicon_service.h

Index: chrome/browser/favicon/favicon_service.h
diff --git a/chrome/browser/favicon/favicon_service.h b/chrome/browser/favicon/favicon_service.h
index 38bde8afe542478f2638a99a31772de8fe756033..5593d8b273d3de0bbd86386ddc9adab23543ccb7 100644
--- a/chrome/browser/favicon/favicon_service.h
+++ b/chrome/browser/favicon/favicon_service.h
@@ -18,6 +18,7 @@
 class FaviconClient;
 class GURL;
 class HistoryService;
+struct ImportedFaviconUsage;
 class Profile;
 
 // The favicon service provides methods to access favicons. It calls the history
@@ -179,6 +180,12 @@
   // page is ever visited.
   void CloneFavicon(const GURL& old_page_url, const GURL& new_page_url);
 
+  // Allows the importer to set 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);
+
   // Set the favicon for |page_url| for |icon_type| in the thumbnail database.
   // Unlike SetFavicons(), this method will not delete preexisting bitmap data
   // which is associated to |page_url| if at all possible. Use this method if