Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

content/browser/plugin_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/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/content_switches.h"
 #include "content/test/net/url_request_mock_http_job.h"
 #include "webkit/plugins/plugin_switches.h"
 
 #if defined(OS_WIN)
 #include "base/win/registry.h"
 #endif
@@ skipping 58 matching lines @@
 
   virtual void SetUpOnMainThread() OVERRIDE {
     FilePath path = ui_test_utils::GetTestFilePath(FilePath(), FilePath());
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE, base::Bind(&SetUrlRequestMock, path));
   }
 
   void LoadAndWait(const GURL& url) {
     string16 expected_title(ASCIIToUTF16("OK"));
     ui_test_utils::TitleWatcher title_watcher(
-        browser()->GetActiveWebContents(), expected_title);
+        chrome::GetActiveWebContents(browser()), expected_title);
     title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
     title_watcher.AlsoWaitForTitle(ASCIIToUTF16("plugin_not_found"));
     ui_test_utils::NavigateToURL(browser(), url);
     string16 title = title_watcher.WaitAndGetTitle();
     if (title == ASCIIToUTF16("plugin_not_found")) {
       const testing::TestInfo* const test_info =
           testing::UnitTest::GetInstance()->current_test_info();
       LOG(INFO) << "PluginTest." << test_info->name() <<
                    " not running because plugin not installed.";
     } else {
@@ skipping 70 matching lines @@
 // This was never ported to Mac. The only thing remaining is to make
 // ui_test_utils::SimulateMouseClick get to Mac plugins, currently it doesn't
 // work.
 IN_PROC_BROWSER_TEST_F(PluginTest,
                        SelfDeletePluginInvokeInSynchronousMouseUp) {
   ui_test_utils::NavigateToURL(
       browser(), GetURL("execute_script_delete_in_mouse_up.html"));
 
   string16 expected_title(ASCIIToUTF16("OK"));
   ui_test_utils::TitleWatcher title_watcher(
-      browser()->GetActiveWebContents(), expected_title);
+      chrome::GetActiveWebContents(browser()), expected_title);
   title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
-  ui_test_utils::SimulateMouseClick(browser()->GetActiveWebContents());
+  ui_test_utils::SimulateMouseClick(chrome::GetActiveWebContents(browser()));
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 }
 #endif
 
 // Flaky, http://crbug.com/60071.
 IN_PROC_BROWSER_TEST_F(PluginTest, GetURLRequest404Response) {
   GURL url(URLRequestMockHTTPJob::GetMockUrl(
       FilePath().AppendASCII("npapi").
                  AppendASCII("plugin_url_request_404.html")));
   LoadAndWait(url);
 }
 
 // Tests if a plugin executing a self deleting script using Invoke with
 // a modal dialog showing works without crashing or hanging
 // Disabled, flakily exceeds timeout, http://crbug.com/46257.
 IN_PROC_BROWSER_TEST_F(PluginTest, SelfDeletePluginInvokeAlert) {
   // Navigate asynchronously because if we waitd until it completes, there's a
   // race condition where the alert can come up before we start watching for it.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(), GetURL("self_delete_plugin_invoke_alert.html"), CURRENT_TAB,
       0);
 
   string16 expected_title(ASCIIToUTF16("OK"));
   ui_test_utils::TitleWatcher title_watcher(
-      browser()->GetActiveWebContents(), expected_title);
+      chrome::GetActiveWebContents(browser()), expected_title);
   title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
 
   ui_test_utils::WaitForAppModalDialogAndCloseIt();
 
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 }
 
 // Test passing arguments to a plugin.
 IN_PROC_BROWSER_TEST_F(PluginTest, Arguments) {
   LoadAndWait(GetURL("arguments.html"));
@@ skipping 177 matching lines @@
 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_PluginConvertPointTest) {
   gfx::NativeWindow window = NULL;
   gfx::Rect bounds(50, 50, 400, 400);
   ui_test_utils::GetNativeWindow(browser(), &window);
   ui_test_utils::SetWindowBounds(window, bounds);
 
   ui_test_utils::NavigateToURL(browser(), GetURL("convert_point.html"));
 
   string16 expected_title(ASCIIToUTF16("OK"));
   ui_test_utils::TitleWatcher title_watcher(
-      browser()->GetActiveWebContents(), expected_title);
+      chrome::GetActiveWebContents(browser()), expected_title);
   title_watcher.AlsoWaitForTitle(ASCIIToUTF16("FAIL"));
   // TODO(stuartmorgan): When the automation system supports sending clicks,
   // change the test to trigger on mouse-down rather than window focus.
   static_cast<content::WebContentsDelegate*>(browser())->
-      ActivateContents(browser()->GetActiveWebContents());
+      ActivateContents(chrome::GetActiveWebContents(browser()));
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 }
 #endif
 
 IN_PROC_BROWSER_TEST_F(PluginTest, Flash) {
   TestPlugin("flash.html");
 }
 
 #if defined(OS_WIN)
 // Windows only test
@@ skipping 40 matching lines @@
 
 // http://crbug.com/8690
 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_Java) {
   TestPlugin("Java.html");
 }
 
 IN_PROC_BROWSER_TEST_F(PluginTest, Silverlight) {
   TestPlugin("silverlight.html");
 }
 #endif  // defined(OS_WIN)