Switch FaviconTabHelper to use WebContentsUserData.

chrome/browser/ui/web_applications/web_app_ui.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/web_applications/web_app_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 130 matching lines @@
     DeleteMe();  // We are done if underlying WebContents is gone.
     return;
   }
 
   if (unprocessed_icons_.empty()) {
     // No app icon. Just use the favicon from WebContents.
     UpdateShortcuts();
     return;
   }
 
-  tab_contents_->favicon_tab_helper()->DownloadImage(
-      unprocessed_icons_.back().url,
-      std::max(unprocessed_icons_.back().width,
-               unprocessed_icons_.back().height),
-      history::FAVICON,
-      base::Bind(&UpdateShortcutWorker::OnIconDownloaded,
-                 base::Unretained(this)));
+  FaviconTabHelper::FromWebContents(tab_contents_->web_contents())->
+      DownloadImage(unprocessed_icons_.back().url,
+                    std::max(unprocessed_icons_.back().width,
+                             unprocessed_icons_.back().height),
+                    history::FAVICON,
+                    base::Bind(&UpdateShortcutWorker::OnIconDownloaded,
+                               base::Unretained(this)));
   unprocessed_icons_.pop_back();
 }
 
 void UpdateShortcutWorker::OnIconDownloaded(int download_id,
                                             bool errored,
                                             const SkBitmap& image) {
   if (tab_contents_ == NULL) {
     DeleteMe();  // We are done if underlying WebContents is gone.
     return;
   }
@@ skipping 133 matching lines @@
 
 }  // namespace
 
 namespace web_app {
 
 void GetShortcutInfoForTab(TabContents* tab_contents,
                            ShellIntegration::ShortcutInfo* info) {
   DCHECK(info);  // Must provide a valid info.
   const WebContents* web_contents = tab_contents->web_contents();
 
+  const FaviconTabHelper* favicon_tab_helper =
+      FaviconTabHelper::FromWebContents(web_contents);
   const extensions::TabHelper* extensions_tab_helper =
       extensions::TabHelper::FromWebContents(web_contents);
   const WebApplicationInfo& app_info = extensions_tab_helper->web_app_info();
 
   info->url = app_info.app_url.is_empty() ? web_contents->GetURL() :
                                             app_info.app_url;
   info->title = app_info.title.empty() ?
       (web_contents->GetTitle().empty() ? UTF8ToUTF16(info->url.spec()) :
                                           web_contents->GetTitle()) :
       app_info.title;
   info->description = app_info.description;
-  info->favicon =
-      gfx::Image(tab_contents->favicon_tab_helper()->GetFavicon());
+  info->favicon = gfx::Image(favicon_tab_helper->GetFavicon());
 
   info->profile_path = tab_contents->profile()->GetPath();
 }
 
 void UpdateShortcutForTabContents(TabContents* tab_contents) {
 #if defined(OS_WIN)
   // UpdateShortcutWorker will delete itself when it's done.
   UpdateShortcutWorker* worker = new UpdateShortcutWorker(tab_contents);
   worker->Run();
 #endif  // defined(OS_WIN)
 }
 
 }  // namespace web_app