Pass an instance of FaviconClient to FaviconService.

chrome/browser/favicon/favicon_service.h

Index: chrome/browser/favicon/favicon_service.h
diff --git a/chrome/browser/favicon/favicon_service.h b/chrome/browser/favicon/favicon_service.h
index dfbd1f40f0677f3a42bd1b34a64c7ab09747c310..7ecec2679aa614bd778ec8e8179154db814125c4 100644
--- a/chrome/browser/favicon/favicon_service.h
+++ b/chrome/browser/favicon/favicon_service.h
@@ -16,6 +16,7 @@
 #include "components/keyed_service/core/keyed_service.h"
 #include "ui/base/layout.h"
 
+class FaviconClient;
 class GURL;
 class HistoryService;
 struct ImportedFaviconUsage;
@@ -25,7 +26,7 @@ class Profile;
 // backend behind the scenes.
 class FaviconService : public KeyedService {
  public:
-  explicit FaviconService(Profile* profile);
+  explicit FaviconService(Profile* profile, FaviconClient* favicon_client);

[blundell, 2014/05/27 18:48:40]

nit: get rid of explicit

[blundell, 2014/05/27 18:48:40]

Add a comment on these parameters, including their expected lifetimes. Add a
TODO(jif) to eliminate the Profile parameter with a bug link.

[jif, 2014/05/28 09:05:40]

Done.

 
   virtual ~FaviconService();
 
@@ -220,6 +221,7 @@ class FaviconService : public KeyedService {
   base::hash_set<MissingFaviconURLHash> missing_favicon_urls_;
   HistoryService* history_service_;
   Profile* profile_;
+  FaviconClient* favicon_client_;
 
   // Helper function for GetFaviconImageForURL(), GetRawFaviconForURL() and
   // GetFaviconForURL().