Revert of Bypass the favicon_service when importing favicons.

chrome/browser/importer/profile_writer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/importer/profile_writer.h"
 
 #include <map>
 #include <set>
 #include <string>
 
@@ skipping 208 matching lines @@
 
   model->EndExtensiveChanges();
 
   // If the user was previously using a toolbar, we should show the bar.
   if (import_to_top_level && !add_all_to_top_level)
     ShowBookmarkBar(profile_);
 }
 
 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;
 
 // Returns the key for the map built by BuildHostPathMap. If url_string is not
 // a valid URL, an empty string is returned, otherwise host+path is returned.
 static std::string HostPathKeyForURL(const GURL& url) {
   return url.is_valid() ? url.host() + url.path() : std::string();
 }
 
@@ skipping 77 matching lines @@
 
     // Only add valid TemplateURLs to the model.
     if ((*i)->url_ref().IsValid(model->search_terms_data())) {
       model->Add(*i);  // Takes ownership.
       *i = NULL;  // Prevent the vector from deleting *i later.
     }
   }
 }
 
 ProfileWriter::~ProfileWriter() {}