Switch FaviconTabHelper to use WebContentsUserData.

chrome/browser/ui/tab_contents/tab_contents.h

Index: chrome/browser/ui/tab_contents/tab_contents.h
diff --git a/chrome/browser/ui/tab_contents/tab_contents.h b/chrome/browser/ui/tab_contents/tab_contents.h
index 30fee8e046c71313125b57128e44888e05b0a193..81a30ff0e1aa4d1d5024ea09d227d2124edec9a1 100644
--- a/chrome/browser/ui/tab_contents/tab_contents.h
+++ b/chrome/browser/ui/tab_contents/tab_contents.h
@@ -24,7 +24,6 @@ class ConstrainedWebDialogDelegateBase;
 class ConstrainedWindowTabHelper;
 class ExtensionTabUtil;
 class ExternalTabContainerWin;
-class FaviconTabHelper;
 class GeolocationPermissionContextTests;
 class InfoBarControllerContentsCreator;
 class InfoBarTabHelper;
@@ -154,7 +153,6 @@ class TabContents : public content::WebContentsObserver {
     return constrained_window_tab_helper_.get();
   }
 
-  FaviconTabHelper* favicon_tab_helper() { return favicon_tab_helper_.get(); }
   InfoBarTabHelper* infobar_tab_helper() { return infobar_tab_helper_.get(); }
 
   PasswordManager* password_manager() { return password_manager_.get(); }
@@ -197,7 +195,6 @@ class TabContents : public content::WebContentsObserver {
   scoped_ptr<TabAutofillManagerDelegate> autofill_delegate_;
   scoped_ptr<AutofillExternalDelegate> autofill_external_delegate_;
   scoped_ptr<ConstrainedWindowTabHelper> constrained_window_tab_helper_;
-  scoped_ptr<FaviconTabHelper> favicon_tab_helper_;
   scoped_ptr<InfoBarTabHelper> infobar_tab_helper_;
 
   // PasswordManager and its delegate. The delegate must outlive the manager,