Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/prerender/prefetch_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/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 
 namespace {
 
 const char kPrefetchPage[] = "files/prerender/simple_prefetch.html";
 
 class PrefetchBrowserTestBase : public InProcessBrowserTest {
  public:
@@ skipping 28 matching lines @@
  public:
   PrefetchBrowserTestNoPrefetching()
       : PrefetchBrowserTestBase(false) {}
 };
 
 IN_PROC_BROWSER_TEST_F(PrefetchBrowserTest, PrefetchOn) {
   ASSERT_TRUE(test_server()->Start());
   GURL url = test_server()->GetURL(kPrefetchPage);
 
   const string16 expected_title = ASCIIToUTF16("link onload");
-  ui_test_utils::TitleWatcher title_watcher(browser()->GetActiveWebContents(),
-                                            expected_title);
+  ui_test_utils::TitleWatcher title_watcher(
+      chrome::GetActiveWebContents(browser()),
+      expected_title);
   ui_test_utils::NavigateToURL(browser(), url);
 
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 }
 
 IN_PROC_BROWSER_TEST_F(PrefetchBrowserTestNoPrefetching, PrefetchOff) {
   ASSERT_TRUE(test_server()->Start());
   GURL url = test_server()->GetURL(kPrefetchPage);
 
   const string16 expected_title = ASCIIToUTF16("link onerror");
-  ui_test_utils::TitleWatcher title_watcher(browser()->GetActiveWebContents(),
-                                            expected_title);
+  ui_test_utils::TitleWatcher title_watcher(
+      chrome::GetActiveWebContents(browser()),
+      expected_title);
   ui_test_utils::NavigateToURL(browser(), url);
 
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 }
 
 }  // namespace