Switch FaviconTabHelper to use WebContentsUserData.

chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc

Index: chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc
diff --git a/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc
index c1a6027788c125b8d231c057fe4b2cb8a6fe21ad..aa21485623eee3bc07b4f5f534aa238c9ef2732f 100644
--- a/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc
+++ b/chrome/browser/ui/ash/launcher/browser_launcher_item_controller.cc
@@ -183,8 +183,10 @@ void BrowserLauncherItemController::TabChangedAt(
     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 {
@@ -267,8 +269,10 @@ void BrowserLauncherItemController::UpdateLauncher(TabContents* tab) {
   } 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);
       }