Move the FaviconClient implementation to ChromeFaviconClient.

chrome/browser/favicon/favicon_tab_helper.h

Index: chrome/browser/favicon/favicon_tab_helper.h
diff --git a/chrome/browser/favicon/favicon_tab_helper.h b/chrome/browser/favicon/favicon_tab_helper.h
index b1df49777bad598ecb2c8e4a400231a7b4437582..28c460cca7102e597dcc1529a9097e5e6b3fafc9 100644
--- a/chrome/browser/favicon/favicon_tab_helper.h
+++ b/chrome/browser/favicon/favicon_tab_helper.h
@@ -35,7 +35,6 @@ class SkBitmap;
 // downloaded and saved in the history backend.
 //
 class FaviconTabHelper : public content::WebContentsObserver,
-                         public FaviconClient,
                          public FaviconDriver,
                          public content::WebContentsUserData<FaviconTabHelper> {
  public:
@@ -91,10 +90,6 @@ class FaviconTabHelper : public content::WebContentsObserver,
       const std::vector<SkBitmap>& bitmaps,
       const std::vector<gfx::Size>& original_bitmap_sizes);
 
-  // FaviconClient implementation:
-  virtual FaviconService* GetFaviconService() OVERRIDE;
-  virtual bool IsBookmarked(const GURL& url) OVERRIDE;
-
  private:
   explicit FaviconTabHelper(content::WebContents* web_contents);
   friend class content::WebContentsUserData<FaviconTabHelper>;
@@ -112,6 +107,8 @@ class FaviconTabHelper : public content::WebContentsObserver,
 
   Profile* profile_;
 
+  scoped_ptr<FaviconClient> faviconClient_;

[blundell, 2014/05/26 15:53:07]

nit: Can just be |client_|.

[jif-google, 2014/05/26 17:49:22]

Done.

+
   std::vector<content::FaviconURL> favicon_urls_;
 
   scoped_ptr<FaviconHandler> favicon_handler_;