Switch FaviconTabHelper to use WebContentsUserData.

chrome/browser/ui/ash/launcher/browser_launcher_item_controller.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/ash/launcher/browser_launcher_item_controller.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
 #include "ash/wm/window_util.h"
@@ skipping 165 matching lines @@
     TabContents* tab,
     int index,
     TabStripModelObserver::TabChangeType change_type) {
   UpdateAppState(tab);
   if (index != tab_model_->active_index() ||
       !(change_type != TabStripModelObserver::LOADING_ONLY &&
         change_type != TabStripModelObserver::TITLE_NOT_LOADING)) {
     return;
   }
 
-  if (tab->favicon_tab_helper()->FaviconIsValid() ||
-      !tab->favicon_tab_helper()->ShouldDisplayFavicon()) {
+  FaviconTabHelper* favicon_tab_helper =
+      FaviconTabHelper::FromWebContents(tab->web_contents());
+  if (favicon_tab_helper->FaviconIsValid() ||
+      !favicon_tab_helper->ShouldDisplayFavicon()) {
     // We have the favicon, update immediately.
     UpdateLauncher(tab);
   } else {
     int item_index = launcher_model()->ItemIndexByID(launcher_id());
     if (item_index == -1)
       return;
     ash::LauncherItem item = launcher_model()->items()[item_index];
     item.image = SkBitmap();
     launcher_model()->Set(item_index, item);
   }
@@ skipping 62 matching lines @@
       new_image = *extensions_tab_helper->GetExtensionAppIcon();
     // Only update the icon if we have a new image, or none has been set yet.
     // This avoids flickering to an empty image when a pinned app is opened.
     if (!new_image.isNull())
       item.image = new_image;
     else if (item.image.isNull())
       item.image = extensions::Extension::GetDefaultIcon(true);
   } else {
     DCHECK_EQ(TYPE_TABBED, type());
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-    if (tab->favicon_tab_helper()->ShouldDisplayFavicon()) {
-      item.image = tab->favicon_tab_helper()->GetFavicon().AsImageSkia();
+    FaviconTabHelper* favicon_tab_helper =
+        FaviconTabHelper::FromWebContents(tab->web_contents());
+    if (favicon_tab_helper->ShouldDisplayFavicon()) {
+      item.image = favicon_tab_helper->GetFavicon().AsImageSkia();
       if (item.image.isNull()) {
         item.image = *rb.GetImageSkiaNamed(IDR_DEFAULT_FAVICON);
       }
     } else {
       item.image = *rb.GetImageSkiaNamed(IDR_DEFAULT_FAVICON);
     }
   }
   launcher_model()->Set(item_index, item);
 }
 
 void BrowserLauncherItemController::UpdateAppState(TabContents* tab) {
   ChromeLauncherController::AppState app_state;
 
   if (tab_model_->GetIndexOfTabContents(tab) == TabStripModel::kNoTab) {
     app_state = ChromeLauncherController::APP_STATE_REMOVED;
   } else if (tab_model_->GetActiveTabContents() == tab) {
     if (ash::wm::IsActiveWindow(window_))
       app_state = ChromeLauncherController::APP_STATE_WINDOW_ACTIVE;
     else
       app_state = ChromeLauncherController::APP_STATE_ACTIVE;
   } else {
     app_state = ChromeLauncherController::APP_STATE_INACTIVE;
   }
   launcher_controller()->UpdateAppState(tab, app_state);
 }
 
 ash::LauncherModel* BrowserLauncherItemController::launcher_model() {
   return launcher_controller()->model();
 }