Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/history/history_browsertest.cc

Index: chrome/browser/history/history_browsertest.cc
===================================================================
--- chrome/browser/history/history_browsertest.cc	(revision 145001)
+++ chrome/browser/history/history_browsertest.cc	(working copy)
@@ -13,6 +13,7 @@
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
@@ -138,7 +139,7 @@
   void LoadAndWaitForURL(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"));
     ui_test_utils::NavigateToURL(browser(), url);
     EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
@@ -277,7 +278,7 @@
   // Therefore, Page 11 should be in the history in addition to Page 12.
   LoadAndWaitForFile("history_length_test_page_11.html");
 
-  ui_test_utils::SimulateMouseClick(browser()->GetActiveWebContents());
+  ui_test_utils::SimulateMouseClick(chrome::GetActiveWebContents(browser()));
   LoadAndWaitForFile("history_length_test_page_11.html");
 }
 
@@ -302,9 +303,9 @@
   // so that we're not susceptible (less susceptible?) to a race condition.
   // Should a race condition ever trigger, it won't result in flakiness.
   int num = ui_test_utils::FindInPage(
-      browser()->GetActiveTabContents(), ASCIIToUTF16("<img"), true,
+      chrome::GetActiveTabContents(browser()), ASCIIToUTF16("<img"), true,
       true, NULL);
   EXPECT_GT(num, 0);
   EXPECT_EQ(ASCIIToUTF16("History"),
-            browser()->GetActiveWebContents()->GetTitle());
+            chrome::GetActiveWebContents(browser())->GetTitle());
 }