Switch FaviconTabHelper to use WebContentsUserData.

chrome/browser/ui/gtk/tabs/tab_renderer_gtk.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/gtk/tabs/tab_renderer_gtk.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/debug/trace_event.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/gtk/bookmarks/bookmark_utils_gtk.h"
 #include "chrome/browser/ui/gtk/custom_button.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
-#include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "skia/ext/image_operations.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/gtk/gtk_compat.h"
@@ skipping 285 matching lines @@
   selected_title_color_ =
       theme_service_->GetColor(ThemeService::COLOR_TAB_TEXT);
   unselected_title_color_ =
       theme_service_->GetColor(ThemeService::COLOR_BACKGROUND_TAB_TEXT);
 }
 
 void TabRendererGtk::UpdateData(WebContents* contents,
                                 bool app,
                                 bool loading_only) {
   DCHECK(contents);
-  TabContents* tab_contents = TabContents::FromWebContents(contents);
+  FaviconTabHelper* favicon_tab_helper =
+      FaviconTabHelper::FromWebContents(contents);
 
   if (!loading_only) {
     data_.title = contents->GetTitle();
     data_.incognito = contents->GetBrowserContext()->IsOffTheRecord();
     data_.crashed = contents->IsCrashed();
 
     SkBitmap* app_icon =
         extensions::TabHelper::FromWebContents(contents)->GetExtensionAppIcon();
     if (app_icon) {
       data_.favicon = *app_icon;
     } else {
-      data_.favicon =
-          tab_contents->favicon_tab_helper()->GetFavicon().AsBitmap();
+      data_.favicon = favicon_tab_helper->GetFavicon().AsBitmap();
     }
 
     data_.app = app;
 
     // Make a cairo cached version of the favicon.
     if (!data_.favicon.isNull()) {
       // Instead of resizing the icon during each frame, create our resized
       // icon resource now, send it to the xserver and use that each frame
       // instead.
 
@@ skipping 43 matching lines @@
     // will eventually be chromium-themable and this code will go away.
     data_.is_default_favicon =
         (data_.favicon.pixelRef() ==
         ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
             IDR_DEFAULT_FAVICON)->pixelRef());
   }
 
   // Loading state also involves whether we show the favicon, since that's where
   // we display the throbber.
   data_.loading = contents->IsLoading();
-  data_.show_icon = tab_contents->favicon_tab_helper()->ShouldDisplayFavicon();
+  data_.show_icon = favicon_tab_helper->ShouldDisplayFavicon();
 }
 
 void TabRendererGtk::UpdateFromModel() {
   // Force a layout, since the tab may have grown a favicon.
   Layout();
   SchedulePaint();
 
   if (data_.crashed) {
     if (!should_display_crashed_favicon_ && !IsPerformingCrashAnimation())
       StartCrashAnimation();
@@ skipping 705 matching lines @@
   GdkPixbuf* tab_close = rb.GetNativeImageNamed(IDR_TAB_CLOSE).ToGdkPixbuf();
   close_button_width_ = gdk_pixbuf_get_width(tab_close);
   close_button_height_ = gdk_pixbuf_get_height(tab_close);
 
   const gfx::Font& base_font = rb.GetFont(ui::ResourceBundle::BaseFont);
   title_font_ = new gfx::Font(base_font.GetFontName(), kFontPixelSize);
   title_font_height_ = title_font_->GetHeight();
 
   initialized_ = true;
 }