Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/history/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 <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_service_factory.h"
 #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"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_browser_thread.h"
 #include "googleurl/src/gurl.h"
 
 using content::BrowserThread;
@@ skipping 105 matching lines @@
   }
 
   void ExpectEmptyHistory() {
     std::vector<GURL> urls(GetHistoryContents());
     EXPECT_EQ(0U, urls.size());
   }
 
   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());
   }
 
   void LoadAndWaitForFile(const char* filename) {
     GURL url = ui_test_utils::GetTestUrl(
         FilePath().AppendASCII("History"),
         FilePath().AppendASCII(filename));
     LoadAndWaitForURL(url);
@@ skipping 118 matching lines @@
                        ConsiderRedirectAfterGestureAsUserInitiated) {
   // Test the history length for the following page transition.
   //
   // -open-> Page 11 -slow_redirect-> Page 12.
   //
   // If redirect occurs after a user gesture, e.g., mouse click, the
   // redirect is more likely to be user-initiated rather than automatic.
   // 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");
 }
 
 IN_PROC_BROWSER_TEST_F(HistoryBrowserTest,
                        ConsiderSlowRedirectAsUserInitiated) {
   // Test the history length for the following page transition.
   //
   // -open-> Page 21 -redirect-> Page 22.
   //
   // If redirect occurs more than 5 seconds later after the page is loaded,
   // the redirect is likely to be user-initiated.
   // Therefore, Page 21 should be in the history in addition to Page 22.
   LoadAndWaitForFile("history_length_test_page_21.html");
 }
 
 // If this test flakes, use bug 22111.
 IN_PROC_BROWSER_TEST_F(HistoryBrowserTest, HistorySearchXSS) {
   GURL url(std::string(chrome::kChromeUIHistoryURL) +
       "#q=%3Cimg%20src%3Dx%3Ax%20onerror%3D%22document.title%3D'XSS'%22%3E");
   ui_test_utils::NavigateToURL(browser(), url);
   // Mainly, this is to ensure we send a synchronous message to the renderer
   // 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());
 }