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

chrome/browser/favicon/chrome_fallback_icon_client_factory.h

Index: chrome/browser/favicon/chrome_fallback_icon_client_factory.h
diff --git a/chrome/browser/favicon/chrome_fallback_icon_client_factory.h b/chrome/browser/favicon/chrome_fallback_icon_client_factory.h
new file mode 100644
index 0000000000000000000000000000000000000000..79477a42fd59e5e2cbed93661b69adae60c59427
--- /dev/null
+++ b/chrome/browser/favicon/chrome_fallback_icon_client_factory.h
@@ -0,0 +1,39 @@
+// Copyright 2015 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.
+
+#ifndef CHROME_BROWSER_FAVICON_CHROME_FALLBACK_ICON_CLIENT_FACTORY_H_
+#define CHROME_BROWSER_FAVICON_CHROME_FALLBACK_ICON_CLIENT_FACTORY_H_
+
+#include "base/memory/singleton.h"
+#include "chrome/browser/favicon/chrome_fallback_icon_client.h"

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

You don't need to #include those two files (singleton.h and
chrome_fallback_icon_client.h), instead forward declare the
DefaultSingletonTraits struct and FallbackIconClient.

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

Done.

+#include "components/keyed_service/content/browser_context_keyed_service_factory.h"
+
+class Profile;
+
+// Singleton that owns all ChromeFallbackIconClients and associates them with
+// Profiles.
+class ChromeFallbackIconClientFactory
+    : public BrowserContextKeyedServiceFactory {
+ public:
+  // Returns the instance of FallbackIconClient associated with this profile
+  // (creating one if none exists).
+  static FallbackIconClient* GetForProfile(Profile* profile);
+
+  // Returns an instance of the factory singleton.
+  static ChromeFallbackIconClientFactory* GetInstance();
+
+ private:
+  friend struct DefaultSingletonTraits<ChromeFallbackIconClientFactory>;
+
+  ChromeFallbackIconClientFactory();
+  ~ChromeFallbackIconClientFactory() override;
+
+  // BrowserContextKeyedServiceFactory:
+  KeyedService* BuildServiceInstanceFor(
+      content::BrowserContext* profile) const override;
+  content::BrowserContext* GetBrowserContextToUse(
+      content::BrowserContext* context) const override;
+};
+
+#endif  // CHROME_BROWSER_FAVICON_CHROME_FALLBACK_ICON_CLIENT_FACTORY_H_