Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/extensions/webstore_inline_install_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 "base/command_line.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_install_dialog.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/webstore_inline_installer.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/mock_host_resolver.h"
@@ skipping 46 matching lines @@
     GURL::Replacements replace_host;
     replace_host.SetHostStr(domain);
     return page_url.ReplaceComponents(replace_host);
   }
 
   void RunInlineInstallTest(const std::string& test_function_name) {
     bool result = false;
     std::string script = StringPrintf("%s('%s')", test_function_name.c_str(),
         test_gallery_url_.c_str());
     ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
-        browser()->GetActiveWebContents()->GetRenderViewHost(), L"",
+        chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
         UTF8ToWide(script), &result));
     EXPECT_TRUE(result);
   }
 
   std::string test_gallery_url_;
 };
 
 IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallTest, Install) {
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kAppsGalleryInstallAutoConfirmForTests, "accept");
@@ skipping 44 matching lines @@
       browser(),
       GenerateTestServerUrl(kAppDomain, "install_not_supported.html"));
 
   RunInlineInstallTest("runTest");
 
   // The inline install should fail, and a store-provided URL should be opened
   // in a new tab.
   if (browser()->tab_strip_model()->count() == 1) {
     ui_test_utils::WaitForNewTab(browser());
   }
-  WebContents* web_contents = browser()->GetActiveWebContents();
+  WebContents* web_contents = chrome::GetActiveWebContents(browser());
   EXPECT_EQ(GURL("http://cws.com/show-me-the-money"), web_contents->GetURL());
 }
 
 // The unpack failure test needs to use a different install .crx, which is
 // specified via a command-line flag, so it needs its own test subclass.
 class WebstoreInlineInstallUnpackFailureTest
     : public WebstoreInlineInstallTest {
  public:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     WebstoreInlineInstallTest::SetUpCommandLine(command_line);
@@ skipping 13 matching lines @@
 IN_PROC_BROWSER_TEST_F(WebstoreInlineInstallUnpackFailureTest,
     WebstoreInlineInstallUnpackFailureTest) {
   CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kAppsGalleryInstallAutoConfirmForTests, "accept");
 
   ui_test_utils::NavigateToURL(browser(),
       GenerateTestServerUrl(kAppDomain, "install_unpack_failure.html"));
 
   RunInlineInstallTest("runTest");
 }