[Fallback Icons] Refactor FallbackIconService to be a BrowserContext-level singleton

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 "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/path_service.h"
 #include "base/prefs/testing_pref_store.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/chrome_bookmark_client.h"
 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/favicon/chrome_favicon_client_factory.h"
+#include "chrome/browser/favicon/fallback_icon_service.h"
+#include "chrome/browser/favicon/fallback_icon_service_factory.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/favicon/favicon_service_factory.h"
 #include "chrome/browser/history/chrome_history_client.h"
 #include "chrome/browser/history/chrome_history_client_factory.h"
 #include "chrome/browser/history/content_visit_delegate.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/top_sites_factory.h"
 #include "chrome/browser/history/top_sites_impl.h"
@@ skipping 172 matching lines @@
   scoped_ptr<net::URLRequestContext> context_;
 };
 
 #if defined(ENABLE_NOTIFICATIONS)
 KeyedService* CreateTestDesktopNotificationService(
     content::BrowserContext* profile) {
   return new DesktopNotificationService(static_cast<Profile*>(profile));
 }
 #endif
 
+KeyedService* BuildFallbackIconService(content::BrowserContext* profile) {
+  FallbackIconClient* fallback_icon_client =
+      ChromeFallbackIconClientFactory::GetForProfile(
+          static_cast<Profile*>(profile));

[sdefresne, 2015/03/17 09:41:52]

nit: Profile::FromBrowserContext(profile)

[huangs, 2015/03/23 03:28:35]

Done.

+  return new FallbackIconService(fallback_icon_client);
+}
+
 KeyedService* BuildFaviconService(content::BrowserContext* profile) {
   FaviconClient* favicon_client =
       ChromeFaviconClientFactory::GetForProfile(static_cast<Profile*>(profile));
   return new FaviconService(static_cast<Profile*>(profile), favicon_client);
 }
 
 KeyedService* BuildHistoryService(content::BrowserContext* context) {
   Profile* profile = Profile::FromBrowserContext(context);
   HistoryService* history_service = new HistoryService(
       ChromeHistoryClientFactory::GetForProfile(profile),
@@ skipping 323 matching lines @@
   // Failing a post == leaks == heapcheck failure. Make that an immediate test
   // failure.
   if (resource_context_) {
     CHECK(BrowserThread::DeleteSoon(BrowserThread::IO, FROM_HERE,
                                     resource_context_));
     resource_context_ = NULL;
     content::RunAllPendingInMessageLoop(BrowserThread::IO);
   }
 }
 
+void TestingProfile::CreateFallbackIconService() {
+  FaviconServiceFactory::GetInstance()->SetTestingFactory(
+      this, BuildFallbackIconService);
+}
+
 void TestingProfile::CreateFaviconService() {
   // It is up to the caller to create the history service if one is needed.
   FaviconServiceFactory::GetInstance()->SetTestingFactory(
       this, BuildFaviconService);
 }
 
 bool TestingProfile::CreateHistoryService(bool delete_file, bool no_db) {
   DestroyHistoryService();
   if (delete_file) {
     base::FilePath path = GetPath();
@@ skipping 534 matching lines @@
 #if defined(ENABLE_EXTENSIONS)
                             extension_policy_,
 #endif
                             pref_service_.Pass(),
                             original_profile,
                             guest_session_,
                             supervised_user_id_,
                             policy_service_.Pass(),
                             testing_factories_);
 }