Switch FaviconTabHelper to use WebContentsUserData.

chrome/browser/ui/views/hung_renderer_view.h

Index: chrome/browser/ui/views/hung_renderer_view.h
diff --git a/chrome/browser/ui/views/hung_renderer_view.h b/chrome/browser/ui/views/hung_renderer_view.h
index 189265bf3cb0c9884c65e6baf61b81b8e5e8a13e..05412c22ce39ac24f937f0bb002cd712c7902215 100644
--- a/chrome/browser/ui/views/hung_renderer_view.h
+++ b/chrome/browser/ui/views/hung_renderer_view.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_UI_VIEWS_HUNG_RENDERER_VIEW_H_
 
 #include "base/memory/scoped_vector.h"
+#include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
@@ -58,12 +59,10 @@ class HungPagesTableModel : public views::GroupTableModel {
     WebContentsObserverImpl(HungPagesTableModel* model,
                             TabContents* tab);
 
-    WebContents* web_contents() const {
-      return content::WebContentsObserver::web_contents();
-    }
+    using content::WebContentsObserver::web_contents;

[stevenjb, 2012/10/01 17:56:51]

My understanding is that we avoid 'using' in headers? This doesn't seem too
problematic since it's in a private Impl class, but it still might be better to
eliminate it from here and be explicit (or move the 'using' to the .cc file)

[Avi (use Gerrit), 2012/10/01 19:23:57]

Done.

 
     FaviconTabHelper* favicon_tab_helper() {
-      return tab_->favicon_tab_helper();
+      return FaviconTabHelper::FromWebContents(web_contents());
     }
 
     // WebContentsObserver overrides: