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

chrome/browser/favicon/fallback_icon_service_factory.h

Index: chrome/browser/favicon/fallback_icon_service_factory.h
diff --git a/chrome/browser/autocomplete/in_memory_url_index_factory.h b/chrome/browser/favicon/fallback_icon_service_factory.h
similarity index 40%
copy from chrome/browser/autocomplete/in_memory_url_index_factory.h
copy to chrome/browser/favicon/fallback_icon_service_factory.h
index 4f62a4a211d0cbe7901f94bd53d3d0db8ac7f0bc..827efec4708c1769f338acebe916b23b8f5263f1 100644
--- a/chrome/browser/autocomplete/in_memory_url_index_factory.h
+++ b/chrome/browser/favicon/fallback_icon_service_factory.h
@@ -2,33 +2,40 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_AUTOCOMPLETE_IN_MEMORY_URL_INDEX_FACTORY_H_
-#define CHROME_BROWSER_AUTOCOMPLETE_IN_MEMORY_URL_INDEX_FACTORY_H_
+#ifndef CHROME_BROWSER_FAVICON_FALLBACK_ICON_SERVICE_FACTORY_H_
+#define CHROME_BROWSER_FAVICON_FALLBACK_ICON_SERVICE_FACTORY_H_
 
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
 
 template <typename T> struct DefaultSingletonTraits;
 
-class InMemoryURLIndex;
-class Profile;
+class FallbackIconService;
 
-class InMemoryURLIndexFactory : public BrowserContextKeyedServiceFactory {
+namespace content {
+class BrowserContext;
+}
+
+// Singleton that owns all FallbackIconService and associates them with
+// Profiles.

[pkotwicz, 2015/03/27 18:47:57]

Nit: Profiles -> BrowserContexts

[huangs, 2015/03/27 19:01:51]

Done.

+class FallbackIconServiceFactory : public BrowserContextKeyedServiceFactory {
  public:
-  static InMemoryURLIndex* GetForProfile(Profile* profile);
-  static InMemoryURLIndexFactory* GetInstance();
+  static FallbackIconService* GetForBrowserContext(
+      content::BrowserContext* context);
+
+  static FallbackIconServiceFactory* GetInstance();
 
  private:
-  friend struct DefaultSingletonTraits<InMemoryURLIndexFactory>;
+  friend struct DefaultSingletonTraits<FallbackIconServiceFactory>;
 
-  InMemoryURLIndexFactory();
-  ~InMemoryURLIndexFactory() override;
+  FallbackIconServiceFactory();
+  ~FallbackIconServiceFactory() override;
 
   // BrowserContextKeyedServiceFactory:
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const override;
-  content::BrowserContext* GetBrowserContextToUse(
-      content::BrowserContext* context) const override;
   bool ServiceIsNULLWhileTesting() const override;
+
+  DISALLOW_COPY_AND_ASSIGN(FallbackIconServiceFactory);
 };
 
-#endif  // CHROME_BROWSER_AUTOCOMPLETE_IN_MEMORY_URL_INDEX_FACTORY_H_
+#endif  // CHROME_BROWSER_FAVICON_FALLBACK_ICON_SERVICE_FACTORY_H_