Switch FaviconTabHelper to use WebContentsUserData.

chrome/browser/ui/views/create_application_shortcut_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/create_application_shortcut_view.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 445 matching lines @@
 void CreateUrlApplicationShortcutView::FetchIcon() {
   // There should only be fetch job at a time.
   DCHECK(pending_download_ == NULL);
 
   if (unprocessed_icons_.empty())  // No icons to fetch.
     return;
 
   pending_download_ = new IconDownloadCallbackFunctor(this);
   DCHECK(pending_download_);
 
-  tab_contents_->favicon_tab_helper()->DownloadImage(
-      unprocessed_icons_.back().url,
-      std::max(unprocessed_icons_.back().width,
-               unprocessed_icons_.back().height),
-      history::FAVICON,
-      base::Bind(&IconDownloadCallbackFunctor::Run,
-                 base::Unretained(pending_download_)));
+  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(&IconDownloadCallbackFunctor::Run,
+                               base::Unretained(pending_download_)));
 
   unprocessed_icons_.pop_back();
 }
 
 void CreateUrlApplicationShortcutView::OnIconDownloaded(bool errored,
                                                         const SkBitmap& image) {
   pending_download_ = NULL;
 
   if (!errored && !image.isNull()) {
     shortcut_info_.favicon = gfx::Image(image);
@@ skipping 57 matching lines @@
   if (image.IsEmpty()) {
     shortcut_info_.favicon = ui::ResourceBundle::GetSharedInstance().
         GetImageNamed(IDR_APP_DEFAULT_ICON);
   } else {
     shortcut_info_.favicon = image;
   }
 
   CHECK(app_info_);
   static_cast<AppInfoView*>(app_info_)->UpdateIcon(shortcut_info_.favicon);
 }