Switch FaviconTabHelper to use WebContentsUserData.

chrome/browser/ui/views/hung_renderer_view.cc

 // 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.
 
 #include "chrome/browser/ui/views/hung_renderer_view.h"
 
 #if defined(OS_WIN) && !defined(USE_AURA)
 #include <windows.h>
 #endif
 
@@ skipping 102 matching lines @@
     title = CoreTabHelper::GetDefaultTitle();
   // TODO(xji): Consider adding a special case if the title text is a URL,
   // since those should always have LTR directionality. Please refer to
   // http://crbug.com/6726 for more information.
   base::i18n::AdjustStringForLocaleDirection(&title);
   return title;
 }
 
 gfx::ImageSkia HungPagesTableModel::GetIcon(int row) {
   DCHECK(row >= 0 && row < RowCount());
-  return tab_observers_[row]->favicon_tab_helper()->GetFavicon().AsImageSkia();
+  return FaviconTabHelper::FromWebContents(
+      tab_observers_[row]->web_contents())->GetFavicon().AsImageSkia();
 }
 
 void HungPagesTableModel::SetObserver(ui::TableModelObserver* observer) {
   observer_ = observer;
 }
 
 void HungPagesTableModel::GetGroupRangeForItem(int item,
                                                views::GroupRange* range) {
   DCHECK(range);
   range->start = 0;
@@ skipping 335 matching lines @@
 }
 
 void HideHungRendererDialog(WebContents* contents) {
   if (!logging::DialogsAreSuppressed() &&
       !PlatformHideCustomHungRendererDialog(contents) &&
       HungRendererDialogView::GetInstance())
     HungRendererDialogView::GetInstance()->EndForWebContents(contents);
 }
 
 }  // namespace chrome