Switch Extensions::TabHelper to use WebContents, WebContentsUserData.

chrome/browser/ui/browser_browsertest.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 <string>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #if defined(OS_MACOSX)
@@ skipping 782 matching lines @@
   TabStripModel* model = browser()->tab_strip_model();
 
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/")));
 
   const Extension* extension_app = GetExtension();
 
   ui_test_utils::NavigateToURL(browser(), url);
 
   TabContents* app_contents = chrome::TabContentsFactory(
       browser()->profile(), NULL, MSG_ROUTING_NONE, NULL);
-  app_contents->extension_tab_helper()->SetExtensionApp(extension_app);
+  extensions::TabHelper* extensions_tab_helper =
+      extensions::TabHelper::FromWebContents(app_contents->web_contents());
+  extensions_tab_helper->SetExtensionApp(extension_app);
 
   model->AddTabContents(app_contents, 0, content::PageTransitionFromInt(0),
                         TabStripModel::ADD_NONE);
   model->SetTabPinned(0, true);
   ui_test_utils::NavigateToURL(browser(), url);
 
   MockTabStripModelObserver observer;
   model->AddObserver(&observer);
 
   // Uninstall the extension and make sure TabClosing is sent.
@@ skipping 98 matching lines @@
 
   // Add an pinned app tab.
   host_resolver()->AddRule("www.example.com", "127.0.0.1");
   GURL url(test_server()->GetURL("empty.html"));
   TabStripModel* model = browser()->tab_strip_model();
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/")));
   const Extension* extension_app = GetExtension();
   ui_test_utils::NavigateToURL(browser(), url);
   TabContents* app_contents = chrome::TabContentsFactory(
       browser()->profile(), NULL, MSG_ROUTING_NONE, NULL);
-  app_contents->extension_tab_helper()->SetExtensionApp(extension_app);
+  extensions::TabHelper* extensions_tab_helper =
+      extensions::TabHelper::FromWebContents(app_contents->web_contents());
+  extensions_tab_helper->SetExtensionApp(extension_app);
   model->AddTabContents(app_contents, 0, content::PageTransitionFromInt(0),
                         TabStripModel::ADD_NONE);
   model->SetTabPinned(0, true);
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Add a non pinned tab.
   chrome::NewTab(browser());
 
   // Add a pinned non-app tab.
   chrome::NewTab(browser());
@@ skipping 35 matching lines @@
   EXPECT_FALSE(new_model->IsAppTab(2));
 
   EXPECT_TRUE(new_model->IsTabPinned(0));
   EXPECT_TRUE(new_model->IsTabPinned(1));
   EXPECT_FALSE(new_model->IsTabPinned(2));
 
   EXPECT_EQ(GURL(chrome::kChromeUINewTabURL),
       new_model->GetTabContentsAt(2)->web_contents()->GetURL());
 
   EXPECT_TRUE(
-      new_model->GetTabContentsAt(0)->extension_tab_helper()->extension_app() ==
-          extension_app);
+      extensions::TabHelper::FromWebContents(
+          new_model->GetTabContentsAt(0)->web_contents())->
+              extension_app() == extension_app);
 }
 #endif  // !defined(OS_CHROMEOS)
 
 // This test verifies we don't crash when closing the last window and the app
 // menu is showing.
 IN_PROC_BROWSER_TEST_F(BrowserTest, CloseWithAppMenuOpen) {
   if (browser_defaults::kBrowserAliveWithNoWindows)
     return;
 
   // We need a message loop running for menus on windows.
@@ skipping 10 matching lines @@
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/")));
   const Extension* extension_app = GetExtension();
 
   // Launch it in a window, as AppLauncherHandler::HandleLaunchApp() would.
   WebContents* app_window = application_launch::OpenApplication(
       application_launch::LaunchParams(browser()->profile(), extension_app,
                                        extension_misc::LAUNCH_WINDOW,
                                        NEW_WINDOW));
   ASSERT_TRUE(app_window);
 
-  // Apps launched in a window from the NTP do not have extension_app set in
-  // tab contents.
-  TabContents* tab_contents = TabContents::FromWebContents(app_window);
-  EXPECT_FALSE(tab_contents->extension_tab_helper()->extension_app());
+  // Apps launched in a window from the NTP have an extensions tab helper but
+  // do not have extension_app set in it.
+  ASSERT_TRUE(extensions::TabHelper::FromWebContents(app_window));
+  EXPECT_FALSE(
+      extensions::TabHelper::FromWebContents(app_window)->extension_app());
   EXPECT_EQ(extension_app->GetFullLaunchURL(), app_window->GetURL());
 
   // The launch should have created a new browser.
   ASSERT_EQ(2u, browser::GetBrowserCount(browser()->profile()));
 
   // Find the new browser.
   Browser* new_browser = NULL;
   for (BrowserList::const_iterator i = BrowserList::begin();
        i != BrowserList::end() && !new_browser; ++i) {
     if (*i != browser())
@@ skipping 588 matching lines @@
   ASSERT_GT(ui_test_utils::FindInPage(tab, ASCIIToUTF16("WebKit"), true, true,
                                       NULL, NULL),
             0);
   ASSERT_GT(ui_test_utils::FindInPage(tab, ASCIIToUTF16("OS"), true, true,
                                       NULL, NULL),
             0);
   ASSERT_GT(ui_test_utils::FindInPage(tab, ASCIIToUTF16("JavaScript"), true,
                                       true, NULL, NULL),
             0);
 }