Revert of Bypass the favicon_service when importing favicons.

chrome/browser/importer/profile_writer.cc

Index: chrome/browser/importer/profile_writer.cc
diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc
index c34281c12ae774a9a850f83bed1dc735d4a7f30f..eb02768c21e850cf2591cba9e13ecc720c6c845b 100644
--- a/chrome/browser/importer/profile_writer.cc
+++ b/chrome/browser/importer/profile_writer.cc
@@ -226,10 +226,8 @@
 
 void ProfileWriter::AddFavicons(
     const std::vector<ImportedFaviconUsage>& favicons) {
-  HistoryService* history_service =
-      HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
-  if (history_service)
-    history_service->SetImportedFavicons(favicons);
+  FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS)->
+      SetImportedFavicons(favicons);
 }
 
 typedef std::map<std::string, TemplateURL*> HostPathMap;