Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/automation/automation_tab_helper_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/file_path.h"
 #include "base/path_service.h"
 #include "base/string16.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/automation/automation_tab_helper.h"
 #include "chrome/browser/automation/mock_tab_event_observer.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 59 matching lines @@
   }
 
   // Executes javascript to execute a given test case found in the current
   // page's script. If |wait_for_response| is true, this method will not
   // return until the javascript has been executed.
   // Use with [ASSERT|EXPECT]_NO_FATAL_FAILURE.
   void RunTestCaseInJavaScript(int test_case_number, bool wait_for_response) {
     std::string script = base::StringPrintf("runTestCase(%d);",
                                             test_case_number);
     content::RenderViewHost* host =
-        browser()->GetActiveWebContents()->GetRenderViewHost();
+        chrome::GetActiveWebContents(browser())->GetRenderViewHost();
     if (wait_for_response) {
       ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
           host, L"", ASCIIToWide(script)));
     } else {
       script += "window.domAutomationController.setAutomationId(0);"
                 "window.domAutomationController.send(0);";
       host->ExecuteJavascriptInWebFrame(string16(), ASCIIToUTF16(script));
     }
   }
 
   // Returns the |AutomationTabHelper| for the first browser's first tab.
   AutomationTabHelper* tab_helper() {
-    return browser()->GetTabContentsAt(0)->automation_tab_helper();
+    return chrome::GetTabContentsAt(browser(), 0)->automation_tab_helper();
   }
 
  protected:
   FilePath test_data_dir_;
 };
 
 IN_PROC_BROWSER_TEST_F(AutomationTabHelperBrowserTest, FormSubmission) {
   ui_test_utils::NavigateToURL(browser(), net::FilePathToFileURL(
       test_data_dir_.AppendASCII("client_redirects.html")));
 
@@ skipping 89 matching lines @@
 IN_PROC_BROWSER_TEST_F(AutomationTabHelperBrowserTest,
                        CrashedTabStopsLoading) {
   MockTabEventObserver mock_tab_observer(tab_helper());
 
   testing::InSequence expect_in_sequence;
   EXPECT_CALL(mock_tab_observer, OnFirstPendingLoad(_));
   EXPECT_CALL(mock_tab_observer, OnNoMorePendingLoads(_));
 
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUICrashURL));
 }