Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/extensions/extension_url_rewrite_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/process_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
 
 using content::NavigationEntry;
 
 class ExtensionURLRewriteBrowserTest : public ExtensionBrowserTest {
  protected:
   std::string GetLocationBarText() const {
     return UTF16ToUTF8(
         browser()->window()->GetLocationBar()->GetLocationEntry()->GetText());
   }
 
   GURL GetLocationBarTextAsURL() const {
     return GURL(GetLocationBarText());
   }
 
   content::NavigationController* GetNavigationController() const {
-    return &browser()->GetActiveWebContents()->GetController();
+    return &chrome::GetActiveWebContents(browser())->GetController();
   }
 
   NavigationEntry* GetNavigationEntry() const {
     return GetNavigationController()->GetActiveEntry();
   }
 
   FilePath GetTestExtensionPath(const char* extension_name) const {
     return test_data_dir_.AppendASCII("browsertest/url_rewrite/").
         AppendASCII(extension_name);
   }
@@ skipping 56 matching lines @@
   TestExtensionURLOverride(url_with_ref);
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionURLRewriteBrowserTest, BookmarksURLOverride) {
   // Load an extension that overrides chrome://bookmarks.
   LoadExtension(GetTestExtensionPath("bookmarks"));
   // Navigate to chrome://bookmarks and check that the location bar URL is what
   // was entered and the internal URL uses the chrome-extension:// scheme.
   TestExtensionURLOverride(GURL(chrome::kChromeUIBookmarksURL));
 }