Switch Extensions::TabHelper to use WebContents, 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 404 matching lines @@
 }
 
 CreateUrlApplicationShortcutView::CreateUrlApplicationShortcutView(
     TabContents* tab_contents)
     : CreateApplicationShortcutView(tab_contents->profile()),
       tab_contents_(tab_contents),
       pending_download_(NULL)  {
 
   web_app::GetShortcutInfoForTab(tab_contents_, &shortcut_info_);
   const WebApplicationInfo& app_info =
-      tab_contents_->extension_tab_helper()->web_app_info();
+      extensions::TabHelper::FromWebContents(tab_contents_->web_contents())->
+          web_app_info();
   if (!app_info.icons.empty()) {
     web_app::GetIconsInfo(app_info, &unprocessed_icons_);
     FetchIcon();
   }
 
   InitControls();
 }
 
 CreateUrlApplicationShortcutView::~CreateUrlApplicationShortcutView() {
   if (pending_download_)
     pending_download_->Cancel();
 }
 
 bool CreateUrlApplicationShortcutView::Accept() {
   if (!CreateApplicationShortcutView::Accept())
     return false;
 
-  tab_contents_->extension_tab_helper()->SetAppIcon(
-      shortcut_info_.favicon.IsEmpty() ? SkBitmap() :
-                                         *shortcut_info_.favicon.ToSkBitmap());
+  extensions::TabHelper::FromWebContents(tab_contents_->web_contents())->
+      SetAppIcon(shortcut_info_.favicon.IsEmpty()
+          ? SkBitmap()
+          : *shortcut_info_.favicon.ToSkBitmap());
   Browser* browser =
       browser::FindBrowserWithWebContents(tab_contents_->web_contents());
   if (browser)
     chrome::ConvertTabToAppWindow(browser, tab_contents_->web_contents());
   return true;
 }
 
 void CreateUrlApplicationShortcutView::FetchIcon() {
   // There should only be fetch job at a time.
   DCHECK(pending_download_ == NULL);
@@ skipping 81 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);
 }