Switch FaviconTabHelper to use WebContentsUserData.

chrome/browser/ui/views/hung_renderer_view.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_HUNG_RENDERER_VIEW_H_
 #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"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/table/group_table_model.h"
 #include "ui/views/controls/table/group_table_view.h"
 #include "ui/views/window/dialog_delegate.h"
 
 using content::RenderViewHost;
 using content::WebContents;
@@ skipping 32 matching lines @@
       OVERRIDE;
 
  private:
   // Used to track a single WebContents. If the WebContents is destroyed
   // TabDestroyed() is invoked on the model.
   class WebContentsObserverImpl : public content::WebContentsObserver {
    public:
     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:
     virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE;
     virtual void WebContentsDestroyed(WebContents* tab) OVERRIDE;
 
    private:
     HungPagesTableModel* model_;
     TabContents* tab_;
 
@@ skipping 90 matching lines @@
   // Whether or not we've created controls for ourself.
   bool initialized_;
 
   // An amusing icon image.
   static gfx::ImageSkia* frozen_icon_;
 
   DISALLOW_COPY_AND_ASSIGN(HungRendererDialogView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_HUNG_RENDERER_VIEW_H_