Moves knowledge of Profile out of FaviconHandler, into FaviconTabHelper.

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 72f561fda2eaea7427ebf5e5803786f0907ff8f8..6d99ad63e51879d1d3131ec426f23fde12237778 100644
--- a/chrome/browser/favicon/favicon_tab_helper.h
+++ b/chrome/browser/favicon/favicon_tab_helper.h
@@ -10,6 +10,7 @@
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "components/favicon/content/browser/content_favicon_driver.h"
+#include "components/favicon/core/browser/favicon_client.h"
 #include "components/favicon/core/favicon_handler_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
@@ -31,6 +32,7 @@ class SkBitmap;
 // downloaded and saved in the history backend.
 //
 class FaviconTabHelper : public content::WebContentsObserver,
+                         public FaviconClient,
                          public FaviconHandlerDelegate,
                          public content::WebContentsUserData<FaviconTabHelper> {
  public:
@@ -80,6 +82,9 @@ class FaviconTabHelper : public content::WebContentsObserver,
       const std::vector<SkBitmap>& bitmaps,
       const std::vector<gfx::Size>& original_bitmap_sizes);
 
+  // Returns a FaviconService.

[blundell, 2014/04/09 09:17:21]

Don't need to comment overriden methods. Just say "FaviconClient
implementation:"

[jif, 2014/04/09 11:22:48]

Done.

+  virtual FaviconService* GetFaviconService() OVERRIDE;
+
  private:
   explicit FaviconTabHelper(content::WebContents* web_contents);
   friend class content::WebContentsUserData<FaviconTabHelper>;