Moving FaviconService to a ProfileKeyedService.

chrome/test/base/testing_profile.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/test/base/testing_profile.h"
 
 #include "build/build_config.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/message_loop_proxy.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/favicon/favicon_service.h"
+#include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/shortcuts_backend.h"
 #include "chrome/browser/history/shortcuts_backend_factory.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/net/proxy_service_factory.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
@@ skipping 253 matching lines @@
 
 TestingProfile::~TestingProfile() {
   MaybeSendDestroyedNotification();
 
   profile_dependency_manager_->DestroyProfileServices(this);
 
   if (host_content_settings_map_)
     host_content_settings_map_->ShutdownOnUIThread();
 
   DestroyTopSites();
-  DestroyFaviconService();
 
   if (pref_proxy_config_tracker_.get())
     pref_proxy_config_tracker_->DetachFromPrefService();
 }
 
+static ProfileKeyedService* BuildFaviconService(Profile* profile) {
+  return new FaviconService(
+      HistoryServiceFactory::GetForProfileWithoutCreating(profile));
+}
+
 void TestingProfile::CreateFaviconService() {
-  favicon_service_.reset(new FaviconService(this));
+  // It is up to the caller to create the history service if one is needed.
+  FaviconServiceFactory::GetInstance()->SetTestingFactory(
+      this, BuildFaviconService);
 }
 
 static scoped_refptr<RefcountedProfileKeyedService> BuildHistoryService(
     Profile* profile) {
   return new HistoryService(profile);
 }
 
 void TestingProfile::CreateHistoryService(bool delete_file, bool no_db) {
   DestroyHistoryService();
   if (delete_file) {
@@ skipping 47 matching lines @@
     top_sites_->Shutdown();
     top_sites_ = NULL;
     // TopSites::Shutdown schedules some tasks (from TopSitesBackend) that need
     // to be run to properly shutdown. Run all pending tasks now. This is
     // normally handled by browser_process shutdown.
     if (MessageLoop::current())
       MessageLoop::current()->RunAllPending();
   }
 }
 
-void TestingProfile::DestroyFaviconService() {
-  favicon_service_.reset();
-}
-
 static ProfileKeyedService* BuildBookmarkModel(Profile* profile) {
   BookmarkModel* bookmark_model = new BookmarkModel(profile);
   bookmark_model->Load();
   return bookmark_model;
 }
 
 
 void TestingProfile::CreateBookmarkModel(bool delete_file) {
 
   if (delete_file) {
@@ skipping 124 matching lines @@
   extension_special_storage_policy_ = extension_special_storage_policy;
 }
 
 ExtensionSpecialStoragePolicy*
 TestingProfile::GetExtensionSpecialStoragePolicy() {
   if (!extension_special_storage_policy_.get())
     extension_special_storage_policy_ = new ExtensionSpecialStoragePolicy(NULL);
   return extension_special_storage_policy_.get();
 }
 
-FaviconService* TestingProfile::GetFaviconService(ServiceAccessType access) {
-  return favicon_service_.get();
-}
-
 net::CookieMonster* TestingProfile::GetCookieMonster() {
   if (!GetRequestContext())
     return NULL;
   return GetRequestContext()->GetURLRequestContext()->cookie_store()->
       GetCookieMonster();
 }
 
 policy::UserCloudPolicyManager* TestingProfile::GetUserCloudPolicyManager() {
   return user_cloud_policy_manager_.get();
 }
@@ skipping 274 matching lines @@
   build_called_ = true;
   return scoped_ptr<TestingProfile>(new TestingProfile(
       path_,
       delegate_,
       extension_policy_,
       pref_service_.Pass(),
       user_cloud_policy_manager_.Pass()));
 }