Revert 281304 "Pass an instance of FaviconClient to FaviconService."

trunk/src/chrome/browser/favicon/favicon_service_factory.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/favicon/favicon_service_factory.h"
 
 #include "base/memory/singleton.h"
 #include "base/prefs/pref_service.h"
-#include "chrome/browser/favicon/chrome_favicon_client_factory.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/common/pref_names.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 
 // static
 FaviconService* FaviconServiceFactory::GetForProfile(
     Profile* profile, Profile::ServiceAccessType sat) {
   if (!profile->IsOffTheRecord()) {
@@ skipping 14 matching lines @@
 // static
 FaviconServiceFactory* FaviconServiceFactory::GetInstance() {
   return Singleton<FaviconServiceFactory>::get();
 }
 
 FaviconServiceFactory::FaviconServiceFactory()
     : BrowserContextKeyedServiceFactory(
         "FaviconService",
         BrowserContextDependencyManager::GetInstance()) {
   DependsOn(HistoryServiceFactory::GetInstance());
-  DependsOn(ChromeFaviconClientFactory::GetInstance());
 }
 
 FaviconServiceFactory::~FaviconServiceFactory() {}
 
 KeyedService* FaviconServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* profile) const {
-  FaviconClient* favicon_client =
-      ChromeFaviconClientFactory::GetForProfile(static_cast<Profile*>(profile));
-  return new FaviconService(static_cast<Profile*>(profile), favicon_client);
+  return new FaviconService(static_cast<Profile*>(profile));
 }
 
 bool FaviconServiceFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }