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

chrome/browser/favicon/fallback_icon_service_factory.cc

Index: chrome/browser/favicon/fallback_icon_service_factory.cc
diff --git a/chrome/browser/enhanced_bookmarks/android/bookmark_image_service_factory.cc b/chrome/browser/favicon/fallback_icon_service_factory.cc
similarity index 33%
copy from chrome/browser/enhanced_bookmarks/android/bookmark_image_service_factory.cc
copy to chrome/browser/favicon/fallback_icon_service_factory.cc
index c994bbfd1f207146b3eaa358ed3f3007b4a8812b..9c8f465a079bd1ba96e8dad4b2cdbb08b1a49ff0 100644
--- a/chrome/browser/enhanced_bookmarks/android/bookmark_image_service_factory.cc
+++ b/chrome/browser/favicon/fallback_icon_service_factory.cc
@@ -2,40 +2,42 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/enhanced_bookmarks/android/bookmark_image_service_android.h"
-#include "chrome/browser/enhanced_bookmarks/android/bookmark_image_service_factory.h"
+#include "chrome/browser/favicon/fallback_icon_service_factory.h"
+
+#include "base/memory/singleton.h"
+#include "chrome/browser/favicon/chrome_fallback_icon_client_factory.h"
+#include "components/favicon/core/fallback_icon_service.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "content/public/browser/browser_context.h"
 
-namespace enhanced_bookmarks {
-
 // static
-BookmarkImageServiceFactory* BookmarkImageServiceFactory::GetInstance() {
-  return Singleton<BookmarkImageServiceFactory>::get();
+FallbackIconService* FallbackIconServiceFactory::GetForBrowserContext(
+    content::BrowserContext* context) {
+  return static_cast<FallbackIconService*>(
+      GetInstance()->GetServiceForBrowserContext(context, true));
 }
 
 // static
-BookmarkImageService* BookmarkImageServiceFactory::GetForBrowserContext(
-    content::BrowserContext* context) {
-  return static_cast<BookmarkImageService*>(
-      GetInstance()->GetServiceForBrowserContext(context, true));
+FallbackIconServiceFactory* FallbackIconServiceFactory::GetInstance() {
+  return Singleton<FallbackIconServiceFactory>::get();
 }
 
-BookmarkImageServiceFactory::BookmarkImageServiceFactory()
+FallbackIconServiceFactory::FallbackIconServiceFactory()
     : BrowserContextKeyedServiceFactory(
-          "BookmarkExtendedStorageService",
-          BrowserContextDependencyManager::GetInstance()) {}
+        "FallbackIconService",
+        BrowserContextDependencyManager::GetInstance()) {
+  DependsOn(ChromeFallbackIconClientFactory::GetInstance());
+}
 
-BookmarkImageServiceFactory::~BookmarkImageServiceFactory() {}
+FallbackIconServiceFactory::~FallbackIconServiceFactory() {}
 
-content::BrowserContext* BookmarkImageServiceFactory::GetBrowserContextToUse(
+KeyedService* FallbackIconServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
-  return context;
+  FallbackIconClient* fallback_icon_client =
+      ChromeFallbackIconClientFactory::GetForBrowserContext(context);
+  return new FallbackIconService(fallback_icon_client);
 }
 
-BookmarkImageService* BookmarkImageServiceFactory::BuildServiceInstanceFor(
-    content::BrowserContext* browser_context) const {
-  return new BookmarkImageServiceAndroid(browser_context);
+bool FallbackIconServiceFactory::ServiceIsNULLWhileTesting() const {
+  return true;
 }
-
-}  // namespace enhanced_bookmarks