Switch Extensions::TabHelper to use WebContents, WebContentsUserData.

chrome/browser/extensions/api/tabs/tabs.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/extensions/api/tabs/tabs.h"
 
 #include <algorithm>
 #include <limits>
 #include <vector>
 
@@ skipping 597 matching lines @@
         window_profile);
   }
   create_params.initial_show_state = ui::SHOW_STATE_NORMAL;
 
   Browser* new_window = CreateBrowserWindow(create_params, window_profile,
                                             extension_id);
 
   for (std::vector<GURL>::iterator i = urls.begin(); i != urls.end(); ++i) {
     TabContents* tab = chrome::AddSelectedTabWithURL(
         new_window, *i, content::PAGE_TRANSITION_LINK);
-    if (window_type == Browser::TYPE_PANEL)
-      tab->extension_tab_helper()->SetExtensionAppIconById(extension_id);
+    if (window_type == Browser::TYPE_PANEL) {
+      extensions::TabHelper::FromWebContents(tab->web_contents())->
+          SetExtensionAppIconById(extension_id);
+    }
   }
   if (contents) {
     TabStripModel* target_tab_strip = new_window->tab_strip_model();
     target_tab_strip->InsertTabContentsAt(urls.size(), contents,
                                           TabStripModel::ADD_NONE);
   } else if (urls.empty()) {
     chrome::NewTab(new_window);
   }
   chrome::SelectNumberedTab(new_window, 0);
 
@@ skipping 709 matching lines @@
   if (url.SchemeIs(chrome::kJavaScriptScheme)) {
     if (!GetExtension()->CanExecuteScriptOnPage(
             tab_contents_->web_contents()->GetURL(),
             tab_contents_->web_contents()->GetURL(),
             tab_id,
             NULL,
             &error_)) {
       return false;
     }
 
-    tab_contents_->extension_tab_helper()->script_executor()->ExecuteScript(
-        extension_id(),
-        ScriptExecutor::JAVASCRIPT,
-        url.path(),
-        ScriptExecutor::TOP_FRAME,
-        extensions::UserScript::DOCUMENT_IDLE,
-        ScriptExecutor::MAIN_WORLD,
-        base::Bind(&UpdateTabFunction::OnExecuteCodeFinished, this));
+    extensions::TabHelper::FromWebContents(tab_contents_->web_contents())->
+        script_executor()->ExecuteScript(
+            extension_id(),
+            ScriptExecutor::JAVASCRIPT,
+            url.path(),
+            ScriptExecutor::TOP_FRAME,
+            extensions::UserScript::DOCUMENT_IDLE,
+            ScriptExecutor::MAIN_WORLD,
+            base::Bind(&UpdateTabFunction::OnExecuteCodeFinished, this));
 
     *is_async = true;
     return true;
   }
 
   tab_contents_->web_contents()->GetController().LoadURL(
       url, content::Referrer(), content::PAGE_TRANSITION_LINK, std::string());
 
   // The URL of a tab contents never actually changes to a JavaScript URL, so
   // this check only makes sense in other cases.
@@ skipping 486 matching lines @@
   // called for every API call the extension made.
   GotLanguage(language);
 }
 
 void DetectTabLanguageFunction::GotLanguage(const std::string& language) {
   SetResult(Value::CreateStringValue(language.c_str()));
   SendResponse(true);
 
   Release();  // Balanced in Run()
 }