Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

content/browser/session_history_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/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.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/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "net/test/test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class SessionHistoryTest : public InProcessBrowserTest {
@@ skipping 29 matching lines @@
     ui_test_utils::NavigateToURL(browser(), url);
   }
 
   // Navigate session history using history.go(distance).
   void JavascriptGo(std::string distance) {
     GURL url("javascript:history.go('" + distance + "')");
     ui_test_utils::NavigateToURL(browser(), url);
   }
 
   std::string GetTabTitle() {
-    return UTF16ToASCII(browser()->GetActiveWebContents()->GetTitle());
+    return UTF16ToASCII(chrome::GetActiveWebContents(browser())->GetTitle());
   }
 
   GURL GetTabURL() {
-    return browser()->GetActiveWebContents()->GetURL();
+    return chrome::GetActiveWebContents(browser())->GetURL();
   }
 
   GURL GetURL(const std::string file) {
     return test_server()->GetURL(std::string("files/session_history/") + file);
   }
 
   void NavigateAndCheckTitle(const char* filename,
                              const std::string& expected_title) {
     string16 expected_title16(ASCIIToUTF16(expected_title));
     ui_test_utils::TitleWatcher title_watcher(
-        browser()->GetActiveWebContents(), expected_title16);
+        chrome::GetActiveWebContents(browser()), expected_title16);
     ui_test_utils::NavigateToURL(browser(), GetURL(filename));
     ASSERT_EQ(expected_title16, title_watcher.WaitAndGetTitle());
   }
 
   void GoBack() {
     ui_test_utils::WindowedNotificationObserver load_stop_observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
     chrome::GoBack(browser(), CURRENT_TAB);
     load_stop_observer.Wait();
@@ skipping 344 matching lines @@
   EXPECT_EQ("foo", GetTabTitle());
 
   GoBack();
   EXPECT_EQ("Default Title", GetTabTitle());
 }
 
 // http://code.google.com/p/chromium/issues/detail?id=56267
 IN_PROC_BROWSER_TEST_F(SessionHistoryTest, HistoryLength) {
   int length;
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
-      browser()->GetActiveWebContents()->GetRenderViewHost(),
+      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
       L"", L"domAutomationController.send(history.length)", &length));
   EXPECT_EQ(1, length);
 
   ui_test_utils::NavigateToURL(browser(), GetURL("title1.html"));
 
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
-      browser()->GetActiveWebContents()->GetRenderViewHost(),
+      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
       L"", L"domAutomationController.send(history.length)", &length));
   EXPECT_EQ(2, length);
 
   // Now test that history.length is updated when the navigation is committed.
   ui_test_utils::NavigateToURL(browser(), GetURL("record_length.html"));
 
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
-      browser()->GetActiveWebContents()->GetRenderViewHost(),
+      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
       L"", L"domAutomationController.send(history.length)", &length));
   EXPECT_EQ(3, length);
 
   GoBack();
   GoBack();
 
   // Ensure history.length is properly truncated.
   ui_test_utils::NavigateToURL(browser(), GetURL("title2.html"));
 
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractInt(
-      browser()->GetActiveWebContents()->GetRenderViewHost(),
+      chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
       L"", L"domAutomationController.send(history.length)", &length));
   EXPECT_EQ(2, length);
 }