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

chrome/browser/ui/webui/fallback_icon_source.h

Index: chrome/browser/ui/webui/fallback_icon_source.h
diff --git a/chrome/browser/ui/webui/fallback_icon_source.h b/chrome/browser/ui/webui/fallback_icon_source.h
index ba4843e158bb902b602b7639ffac980c3171f965..d94ddea27fe88e402ca0c06f387122b6acba4c02 100644
--- a/chrome/browser/ui/webui/fallback_icon_source.h
+++ b/chrome/browser/ui/webui/fallback_icon_source.h
@@ -6,9 +6,15 @@
 #define CHROME_BROWSER_UI_WEBUI_FALLBACK_ICON_SOURCE_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "components/favicon_base/fallback_icon_service.h"
 #include "content/public/browser/url_data_source.h"
 
+class FallbackIconClient;
+class GURL;
+
+namespace favicon_base {
+struct FallbackIconStyle;
+}  // namespace favicon_base
+
 // FallbackIconSource services explicit chrome:// requests for fallback icons.
 //
 // Format:
@@ -41,7 +47,8 @@
 //    32 * 0.5 = 16, and the icon's background shape is a circle.
 class FallbackIconSource : public content::URLDataSource {
  public:
-  FallbackIconSource();
+  // |fallback_icon_client| is owned by caller.
+  explicit FallbackIconSource(FallbackIconClient* fallback_icon_client);

[sdefresne, 2015/03/16 09:11:29]

Should instead use the FallbackIconService.

[huangs, 2015/03/16 22:06:11]

Done.

 
   ~FallbackIconSource() override;
 
@@ -57,11 +64,17 @@ class FallbackIconSource : public content::URLDataSource {
   bool ShouldServiceRequest(const net::URLRequest* request) const override;
 
  private:
+  void SendFallbackIconHelper(
+      const GURL& url,
+      int size_in_pixels,
+      const favicon_base::FallbackIconStyle& style,
+      const content::URLDataSource::GotDataCallback& callback);
+
   // Sends the default fallback icon.
   void SendDefaultResponse(
       const content::URLDataSource::GotDataCallback& callback);
 
-  scoped_ptr<favicon_base::FallbackIconService> fallback_icon_service_;
+  FallbackIconClient* fallback_icon_client_;
 
   DISALLOW_COPY_AND_ASSIGN(FallbackIconSource);
 };