Switch Extensions::TabHelper to use WebContents, 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 84 matching lines @@
 
   // Existing shortcuts.
   std::vector<FilePath> shortcut_files_;
 
   DISALLOW_COPY_AND_ASSIGN(UpdateShortcutWorker);
 };
 
 UpdateShortcutWorker::UpdateShortcutWorker(TabContents* tab_contents)
     : tab_contents_(tab_contents),
       profile_path_(tab_contents->profile()->GetPath()) {
+  extensions::TabHelper* extensions_tab_helper =
+      extensions::TabHelper::FromWebContents(tab_contents->web_contents());
   web_app::GetShortcutInfoForTab(tab_contents_, &shortcut_info_);
-  web_app::GetIconsInfo(tab_contents_->extension_tab_helper()->web_app_info(),
+  web_app::GetIconsInfo(extensions_tab_helper->web_app_info(),
                         &unprocessed_icons_);
   file_name_ = web_app::internals::GetSanitizedFileName(shortcut_info_.title);
 
   registrar_.Add(
       this,
       chrome::NOTIFICATION_TAB_CLOSING,
       content::Source<NavigationController>(
           &tab_contents_->web_contents()->GetController()));
 }
 
@@ skipping 44 matching lines @@
                                             bool errored,
                                             const SkBitmap& image) {
   if (tab_contents_ == NULL) {
     DeleteMe();  // We are done if underlying WebContents is gone.
     return;
   }
 
   if (!errored && !image.isNull()) {
     // Update icon with download image and update shortcut.
     shortcut_info_.favicon = gfx::Image(image);
-    tab_contents_->extension_tab_helper()->SetAppIcon(image);
+    extensions::TabHelper* extensions_tab_helper =
+        extensions::TabHelper::FromWebContents(tab_contents_->web_contents());
+    extensions_tab_helper->SetAppIcon(image);
     UpdateShortcuts();
   } else {
     // Try the next icon otherwise.
     DownloadIcon();
   }
 }
 
 void UpdateShortcutWorker::CheckExistingShortcuts() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
@@ skipping 116 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 WebApplicationInfo& app_info =
-      tab_contents->extension_tab_helper()->web_app_info();
+  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->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