Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/ui/browser_navigator_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 "chrome/browser/ui/browser_navigator_browsertest.h"
 
 #include "base/command_line.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_navigator.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"
 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
@@ skipping 51 matching lines @@
 Browser* BrowserNavigatorTest::CreateEmptyBrowserForApp(Browser::Type type,
                                                         Profile* profile) {
   Browser* browser = Browser::CreateWithParams(
       Browser::CreateParams::CreateForApp(
           Browser::TYPE_POPUP, "Test", gfx::Rect(), profile));
   browser->AddBlankTab(true);
   return browser;
 }
 
 TabContents* BrowserNavigatorTest::CreateTabContents() {
-  return Browser::TabContentsFactory(
+  return chrome::TabContentsFactory(
       browser()->profile(),
       NULL,
       MSG_ROUTING_NONE,
-      browser()->GetActiveWebContents(),
+      chrome::GetActiveWebContents(browser()),
       NULL);
 }
 
 void BrowserNavigatorTest::RunSuppressTest(WindowOpenDisposition disposition) {
-  GURL old_url = browser()->GetActiveWebContents()->GetURL();
+  GURL old_url = chrome::GetActiveWebContents(browser())->GetURL();
   browser::NavigateParams p(MakeNavigateParams());
   p.disposition = disposition;
   browser::Navigate(&p);
 
   // Nothing should have happened as a result of Navigate();
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_EQ(1u, BrowserList::size());
-  EXPECT_EQ(old_url, browser()->GetActiveWebContents()->GetURL());
+  EXPECT_EQ(old_url, chrome::GetActiveWebContents(browser())->GetURL());
 }
 
 void BrowserNavigatorTest::RunUseNonIncognitoWindowTest(const GURL& url) {
   Browser* incognito_browser = CreateIncognitoBrowser();
 
   EXPECT_EQ(2u, BrowserList::size());
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_EQ(1, incognito_browser->tab_count());
 
   // Navigate to the page.
   browser::NavigateParams p(MakeNavigateParams(incognito_browser));
   p.disposition = SINGLETON_TAB;
   p.url = url;
   p.window_action = browser::NavigateParams::SHOW_WINDOW;
   browser::Navigate(&p);
 
   // This page should be opened in browser() window.
   EXPECT_NE(incognito_browser, p.browser);
   EXPECT_EQ(browser(), p.browser);
   EXPECT_EQ(2, browser()->tab_count());
-  EXPECT_EQ(url, browser()->GetActiveWebContents()->GetURL());
+  EXPECT_EQ(url, chrome::GetActiveWebContents(browser())->GetURL());
 }
 
 void BrowserNavigatorTest::RunDoNothingIfIncognitoIsForcedTest(
     const GURL& url) {
   Browser* browser = CreateIncognitoBrowser();
 
   // Set kIncognitoModeAvailability to FORCED.
   PrefService* prefs1 = browser->profile()->GetPrefs();
   prefs1->SetInteger(prefs::kIncognitoModeAvailability,
                      IncognitoModePrefs::FORCED);
   PrefService* prefs2 = browser->profile()->GetOriginalProfile()->GetPrefs();
   prefs2->SetInteger(prefs::kIncognitoModeAvailability,
                      IncognitoModePrefs::FORCED);
 
   // Navigate to the page.
   browser::NavigateParams p(MakeNavigateParams(browser));
   p.disposition = OFF_THE_RECORD;
   p.url = url;
   p.window_action = browser::NavigateParams::SHOW_WINDOW;
   browser::Navigate(&p);
 
   // The page should not be opened.
   EXPECT_EQ(browser, p.browser);
   EXPECT_EQ(1, browser->tab_count());
   EXPECT_EQ(GURL(chrome::kAboutBlankURL),
-            browser->GetActiveWebContents()->GetURL());
+            chrome::GetActiveWebContents(browser)->GetURL());
 }
 
 void BrowserNavigatorTest::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     case content::NOTIFICATION_RENDER_VIEW_HOST_CREATED_FOR_TAB: {
       ++this->created_tab_contents_count_;
       break;
     }
     default:
       break;
   }
 }
 
 
 namespace {
 
 // This test verifies that when a navigation occurs within a tab, the tab count
 // of the Browser remains the same and the current tab bears the loaded URL.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_CurrentTab) {
   ui_test_utils::NavigateToURL(browser(), GetGoogleURL());
-  EXPECT_EQ(GetGoogleURL(), browser()->GetActiveWebContents()->GetURL());
+  EXPECT_EQ(GetGoogleURL(), chrome::GetActiveWebContents(browser())->GetURL());
   // We should have one window with one tab.
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(1, browser()->tab_count());
 }
 
 // This test verifies that a singleton tab is refocused if one is already opened
 // in another or an existing window, or added if it is not.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_SingletonTabExisting) {
   GURL singleton_url1("http://maps.google.com/");
 
   // Register for a notification if an additional tab_contents was instantiated.
   // Opening a Singleton tab that is already opened should not be opening a new
   // tab nor be creating a new TabContents object.
   content::NotificationRegistrar registrar;
 
   // As the registrar object goes out of scope, this will get unregistered
   registrar.Add(this, content::NOTIFICATION_RENDER_VIEW_HOST_CREATED_FOR_TAB,
                 content::NotificationService::AllSources());
 
-  browser()->AddSelectedTabWithURL(
-      singleton_url1, content::PAGE_TRANSITION_LINK);
-  browser()->AddSelectedTabWithURL(
-      GetGoogleURL(), content::PAGE_TRANSITION_LINK);
+  chrome::AddSelectedTabWithURL(browser(), singleton_url1,
+                                content::PAGE_TRANSITION_LINK);
+  chrome::AddSelectedTabWithURL(browser(), GetGoogleURL(),
+                                content::PAGE_TRANSITION_LINK);
 
   // We should have one browser with 3 tabs, the 3rd selected.
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(2, browser()->active_index());
 
   unsigned int previous_tab_contents_count =
       created_tab_contents_count_ = 0;
 
   // Navigate to singleton_url1.
   browser::NavigateParams p(MakeNavigateParams());
   p.disposition = SINGLETON_TAB;
   p.url = singleton_url1;
   browser::Navigate(&p);
 
   // The middle tab should now be selected.
   EXPECT_EQ(browser(), p.browser);
   EXPECT_EQ(1, browser()->active_index());
 
   // No tab contents should have been created
   EXPECT_EQ(previous_tab_contents_count,
             created_tab_contents_count_);
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        Disposition_SingletonTabRespectingRef) {
   GURL singleton_ref_url1("http://maps.google.com/#a");
   GURL singleton_ref_url2("http://maps.google.com/#b");
   GURL singleton_ref_url3("http://maps.google.com/");
 
-  browser()->AddSelectedTabWithURL(
-      singleton_ref_url1, content::PAGE_TRANSITION_LINK);
+  chrome::AddSelectedTabWithURL(browser(), singleton_ref_url1,
+                                content::PAGE_TRANSITION_LINK);
 
   // We should have one browser with 2 tabs, 2nd selected.
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->active_index());
 
   // Navigate to singleton_url2.
   browser::NavigateParams p(MakeNavigateParams());
   p.disposition = SINGLETON_TAB;
   p.url = singleton_ref_url2;
@@ skipping 46 matching lines @@
   // We should now have 2 tabs, the 2nd one selected.
   EXPECT_EQ(browser(), p.browser);
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->active_index());
 }
 
 // This test verifies that when a navigation results in a foreground tab, the
 // tab count of the Browser increases and the selected tab shifts to the new
 // foreground tab.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_NewForegroundTab) {
-  WebContents* old_contents = browser()->GetActiveWebContents();
+  WebContents* old_contents = chrome::GetActiveWebContents(browser());
   browser::NavigateParams p(MakeNavigateParams());
   p.disposition = NEW_FOREGROUND_TAB;
   browser::Navigate(&p);
-  EXPECT_NE(old_contents, browser()->GetActiveWebContents());
-  EXPECT_EQ(browser()->GetActiveTabContents(), p.target_contents);
+  EXPECT_NE(old_contents, chrome::GetActiveWebContents(browser()));
+  EXPECT_EQ(chrome::GetActiveTabContents(browser()), p.target_contents);
   EXPECT_EQ(2, browser()->tab_count());
 }
 
 // This test verifies that when a navigation results in a background tab, the
 // tab count of the Browser increases but the selected tab remains the same.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_NewBackgroundTab) {
-  WebContents* old_contents = browser()->GetActiveWebContents();
+  WebContents* old_contents = chrome::GetActiveWebContents(browser());
   browser::NavigateParams p(MakeNavigateParams());
   p.disposition = NEW_BACKGROUND_TAB;
   browser::Navigate(&p);
-  WebContents* new_contents = browser()->GetActiveWebContents();
+  WebContents* new_contents = chrome::GetActiveWebContents(browser());
   // The selected tab should have remained unchanged, since the new tab was
   // opened in the background.
   EXPECT_EQ(old_contents, new_contents);
   EXPECT_EQ(2, browser()->tab_count());
 }
 
 // This test verifies that when a navigation requiring a new foreground tab
 // occurs in a Browser that cannot host multiple tabs, the new foreground tab
 // is created in an existing compatible Browser.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
@@ skipping 298 matching lines @@
 // This tests adding a foreground tab with a predefined TabContents.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, TargetContents_ForegroundTab) {
   browser::NavigateParams p(MakeNavigateParams());
   p.disposition = NEW_FOREGROUND_TAB;
   p.target_contents = CreateTabContents();
   browser::Navigate(&p);
 
   // Navigate() should have opened the contents in a new foreground in the
   // current Browser.
   EXPECT_EQ(browser(), p.browser);
-  EXPECT_EQ(browser()->GetActiveTabContents(), p.target_contents);
+  EXPECT_EQ(chrome::GetActiveTabContents(browser()), p.target_contents);
 
   // We should have one window, with two tabs.
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(2, browser()->tab_count());
 }
 
 #if defined(OS_WIN)
 // This tests adding a popup with a predefined TabContents.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, DISABLED_TargetContents_Popup) {
   browser::NavigateParams p(MakeNavigateParams());
@@ skipping 51 matching lines @@
 
   // We should have one window - the browser() provided by the framework.
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(2, browser()->tab_count());
 }
 
 // This test verifies that constructing params with a NULL browser has
 // the same result as navigating to a new foreground tab in the (only)
 // active browser. Tests are the same as for Disposition_NewForegroundTab.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, NullBrowser_NewForegroundTab) {
-  WebContents* old_contents = browser()->GetActiveWebContents();
+  WebContents* old_contents = chrome::GetActiveWebContents(browser());
   // Navigate with a NULL browser.
   browser::NavigateParams p(MakeNavigateParams(NULL));
   p.disposition = NEW_FOREGROUND_TAB;
   p.profile = browser()->profile();
   browser::Navigate(&p);
 
   // Navigate() should have found browser() and create a new tab.
   EXPECT_EQ(browser(), p.browser);
-  EXPECT_NE(old_contents, browser()->GetActiveWebContents());
-  EXPECT_EQ(browser()->GetActiveTabContents(), p.target_contents);
+  EXPECT_NE(old_contents, chrome::GetActiveWebContents(browser()));
+  EXPECT_EQ(chrome::GetActiveTabContents(browser()), p.target_contents);
   EXPECT_EQ(2, browser()->tab_count());
 }
 
 // This test verifies that constructing params with a NULL browser and
 // a specific profile matches the specified profile.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, NullBrowser_MatchProfile) {
   // Create a new browser with using the incognito profile.
   Browser* incognito =
       Browser::Create(browser()->profile()->GetOffTheRecordProfile());
 
   // Navigate with a NULL browser and the incognito profile.
   browser::NavigateParams p(MakeNavigateParams(NULL));
   p.disposition = NEW_FOREGROUND_TAB;
   p.profile = incognito->profile();
   browser::Navigate(&p);
 
   // Navigate() should have found incognito, not browser().
   EXPECT_EQ(incognito, p.browser);
-  EXPECT_EQ(incognito->GetActiveTabContents(), p.target_contents);
+  EXPECT_EQ(chrome::GetActiveTabContents(incognito), p.target_contents);
   EXPECT_EQ(1, incognito->tab_count());
 }
 
 // This test verifies that constructing params with a NULL browser and
 // disposition = NEW_WINDOW always opens exactly one new window.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, NullBrowser_NewWindow) {
   browser::NavigateParams p(MakeNavigateParams(NULL));
   p.disposition = NEW_WINDOW;
   p.profile = browser()->profile();
   browser::Navigate(&p);
 
   // Navigate() should have created a new browser.
   EXPECT_NE(browser(), p.browser);
   EXPECT_TRUE( p.browser->is_type_tabbed());
 
   // We should now have two windows, the browser() provided by the framework and
   // the new normal window.
   EXPECT_EQ(2u, BrowserList::size());
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_EQ(1, p.browser->tab_count());
 }
 
 // This test verifies that constructing params with disposition = SINGLETON_TAB
 // and IGNORE_AND_NAVIGATE opens a new tab navigated to the specified URL if
 // no previous tab with that URL (minus the path) exists.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        Disposition_SingletonTabNew_IgnorePath) {
-  browser()->AddSelectedTabWithURL(
-      GetGoogleURL(), content::PAGE_TRANSITION_LINK);
+  chrome::AddSelectedTabWithURL(browser(), GetGoogleURL(),
+                                content::PAGE_TRANSITION_LINK);
 
   // We should have one browser with 2 tabs, the 2nd selected.
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->active_index());
 
   // Navigate to a new singleton tab with a sub-page.
   browser::NavigateParams p(MakeNavigateParams());
   p.disposition = SINGLETON_TAB;
   p.url = GetContentSettingsURL();
   p.window_action = browser::NavigateParams::SHOW_WINDOW;
   p.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
   browser::Navigate(&p);
 
   // The last tab should now be selected and navigated to the sub-page of the
   // URL.
   EXPECT_EQ(browser(), p.browser);
   EXPECT_EQ(3, browser()->tab_count());
   EXPECT_EQ(2, browser()->active_index());
   EXPECT_EQ(GetContentSettingsURL(),
-            browser()->GetActiveWebContents()->GetURL());
+            chrome::GetActiveWebContents(browser())->GetURL());
 }
 
 // This test verifies that constructing params with disposition = SINGLETON_TAB
 // and IGNORE_AND_NAVIGATE opens an existing tab with the matching URL (minus
 // the path) which is navigated to the specified URL.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        Disposition_SingletonTabExisting_IgnorePath) {
   GURL singleton_url1(GetSettingsURL());
-  browser()->AddSelectedTabWithURL(
-      singleton_url1, content::PAGE_TRANSITION_LINK);
-  browser()->AddSelectedTabWithURL(
-      GetGoogleURL(), content::PAGE_TRANSITION_LINK);
+  chrome::AddSelectedTabWithURL(browser(), singleton_url1,
+                                content::PAGE_TRANSITION_LINK);
+  chrome::AddSelectedTabWithURL(browser(), GetGoogleURL(),
+                                content::PAGE_TRANSITION_LINK);
 
   // We should have one browser with 3 tabs, the 3rd selected.
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(3, browser()->tab_count());
   EXPECT_EQ(2, browser()->active_index());
 
   // Navigate to singleton_url1.
   browser::NavigateParams p(MakeNavigateParams());
   p.disposition = SINGLETON_TAB;
   p.url = GetContentSettingsURL();
   p.window_action = browser::NavigateParams::SHOW_WINDOW;
   p.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
   browser::Navigate(&p);
 
   // The middle tab should now be selected and navigated to the sub-page of the
   // URL.
   EXPECT_EQ(browser(), p.browser);
   EXPECT_EQ(3, browser()->tab_count());
   EXPECT_EQ(1, browser()->active_index());
   EXPECT_EQ(GetContentSettingsURL(),
-            browser()->GetActiveWebContents()->GetURL());
+            chrome::GetActiveWebContents(browser())->GetURL());
 }
 
 // This test verifies that constructing params with disposition = SINGLETON_TAB
 // and IGNORE_AND_NAVIGATE opens an existing tab with the matching URL (minus
 // the path) which is navigated to the specified URL.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        Disposition_SingletonTabExistingSubPath_IgnorePath) {
   GURL singleton_url1(GetContentSettingsURL());
-  browser()->AddSelectedTabWithURL(
-      singleton_url1, content::PAGE_TRANSITION_LINK);
-  browser()->AddSelectedTabWithURL(
-      GetGoogleURL(), content::PAGE_TRANSITION_LINK);
+  chrome::AddSelectedTabWithURL(browser(), singleton_url1,
+                                content::PAGE_TRANSITION_LINK);
+  chrome::AddSelectedTabWithURL(browser(), GetGoogleURL(),
+                                content::PAGE_TRANSITION_LINK);
 
   // We should have one browser with 3 tabs, the 3rd selected.
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(3, browser()->tab_count());
   EXPECT_EQ(2, browser()->active_index());
 
   // Navigate to singleton_url1.
   browser::NavigateParams p(MakeNavigateParams());
   p.disposition = SINGLETON_TAB;
   p.url = GetClearBrowsingDataURL();
   p.window_action = browser::NavigateParams::SHOW_WINDOW;
   p.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
   browser::Navigate(&p);
 
   // The middle tab should now be selected and navigated to the sub-page of the
   // URL.
   EXPECT_EQ(browser(), p.browser);
   EXPECT_EQ(3, browser()->tab_count());
   EXPECT_EQ(1, browser()->active_index());
   EXPECT_EQ(GetClearBrowsingDataURL(),
-            browser()->GetActiveWebContents()->GetURL());
+            chrome::GetActiveWebContents(browser())->GetURL());
 }
 
 // This test verifies that constructing params with disposition = SINGLETON_TAB
 // and IGNORE_AND_STAY_PUT opens an existing tab with the matching URL (minus
 // the path).
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        Disposition_SingletonTabExistingSubPath_IgnorePath2) {
   GURL singleton_url1(GetContentSettingsURL());
-  browser()->AddSelectedTabWithURL(
-      singleton_url1, content::PAGE_TRANSITION_LINK);
-  browser()->AddSelectedTabWithURL(
-      GetGoogleURL(), content::PAGE_TRANSITION_LINK);
+  chrome::AddSelectedTabWithURL(browser(), singleton_url1,
+                                content::PAGE_TRANSITION_LINK);
+  chrome::AddSelectedTabWithURL(browser(), GetGoogleURL(),
+                                content::PAGE_TRANSITION_LINK);
 
   // We should have one browser with 3 tabs, the 3rd selected.
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(3, browser()->tab_count());
   EXPECT_EQ(2, browser()->active_index());
 
   // Navigate to singleton_url1.
   browser::NavigateParams p(MakeNavigateParams());
   p.disposition = SINGLETON_TAB;
   p.url = GetClearBrowsingDataURL();
   p.window_action = browser::NavigateParams::SHOW_WINDOW;
   p.path_behavior = browser::NavigateParams::IGNORE_AND_STAY_PUT;
   browser::Navigate(&p);
 
   // The middle tab should now be selected.
   EXPECT_EQ(browser(), p.browser);
   EXPECT_EQ(3, browser()->tab_count());
   EXPECT_EQ(1, browser()->active_index());
   EXPECT_EQ(singleton_url1,
-            browser()->GetActiveWebContents()->GetURL());
+            chrome::GetActiveWebContents(browser())->GetURL());
 }
 
 // This test verifies that constructing params with disposition = SINGLETON_TAB
 // and IGNORE_AND_NAVIGATE will update the current tab's URL if the currently
 // selected tab is a match but has a different path.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        Disposition_SingletonTabFocused_IgnorePath) {
   GURL singleton_url_current(GetContentSettingsURL());
-  browser()->AddSelectedTabWithURL(
-      singleton_url_current, content::PAGE_TRANSITION_LINK);
+  chrome::AddSelectedTabWithURL(browser(), singleton_url_current,
+                                content::PAGE_TRANSITION_LINK);
 
   // We should have one browser with 2 tabs, the 2nd selected.
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->active_index());
 
   // Navigate to a different settings path.
   GURL singleton_url_target(GetClearBrowsingDataURL());
   browser::NavigateParams p(MakeNavigateParams());
   p.disposition = SINGLETON_TAB;
   p.url = singleton_url_target;
   p.window_action = browser::NavigateParams::SHOW_WINDOW;
   p.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE;
   browser::Navigate(&p);
 
   // The second tab should still be selected, but navigated to the new path.
   EXPECT_EQ(browser(), p.browser);
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->active_index());
   EXPECT_EQ(singleton_url_target,
-            browser()->GetActiveWebContents()->GetURL());
+            chrome::GetActiveWebContents(browser())->GetURL());
 }
 
 // This test verifies that constructing params with disposition = SINGLETON_TAB
 // and IGNORE_AND_NAVIGATE will open an existing matching tab with a different
 // query.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        Disposition_SingletonTabExisting_IgnoreQuery) {
   int initial_tab_count = browser()->tab_count();
   GURL singleton_url_current("chrome://settings/internet");
-  browser()->AddSelectedTabWithURL(
-      singleton_url_current, content::PAGE_TRANSITION_LINK);
+  chrome::AddSelectedTabWithURL(browser(), singleton_url_current,
+                                content::PAGE_TRANSITION_LINK);
 
   EXPECT_EQ(initial_tab_count + 1, browser()->tab_count());
   EXPECT_EQ(initial_tab_count, browser()->active_index());
 
   // Navigate to a different settings path.
   GURL singleton_url_target(
       "chrome://settings/internet?"
       "servicePath=/profile/ethernet_00aa00aa00aa&networkType=1");
   browser::NavigateParams p(MakeNavigateParams());
   p.disposition = SINGLETON_TAB;
@@ skipping 26 matching lines @@
   params.disposition = OFF_THE_RECORD;
   {
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     browser::Navigate(&params);
     observer.Wait();
   }
 
   EXPECT_EQ(1u, BrowserList::size());
-  EXPECT_EQ(GetSettingsURL(), browser()->GetActiveWebContents()->GetURL());
+  EXPECT_EQ(GetSettingsURL(),
+            chrome::GetActiveWebContents(browser())->GetURL());
 }
 
 // Settings page is expected to always open in normal mode regardless
 // of whether the user is trying to open it in incognito mode or not.
 // This test verifies that if incognito mode is forced (by policy), settings
 // page doesn't open at all.
 // Disabled until fixed for uber settings: http://crbug.com/111243
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
     DISABLED_Disposition_Settings_DoNothingIfIncognitoIsForced) {
   RunDoNothingIfIncognitoIsForcedTest(GetSettingsURL());
@@ skipping 28 matching lines @@
 // doesn't open at all.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        Disposition_SyncPromo_DoNothingIfIncognitoIsForced) {
   RunDoNothingIfIncognitoIsForcedTest(GURL(chrome::kChromeUISyncPromoURL));
 }
 
 // This test makes sure a crashed singleton tab reloads from a new navigation.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        NavigateToCrashedSingletonTab) {
   GURL singleton_url(GetContentSettingsURL());
-  TabContents* tab_contents = browser()->AddSelectedTabWithURL(
-      singleton_url, content::PAGE_TRANSITION_LINK);
+  TabContents* tab_contents = chrome::AddSelectedTabWithURL(
+      browser(), singleton_url, content::PAGE_TRANSITION_LINK);
   WebContents* web_contents = tab_contents->web_contents();
 
   // We should have one browser with 2 tabs, the 2nd selected.
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, browser()->active_index());
 
   // Kill the singleton tab.
   web_contents->SetIsCrashed(base::TERMINATION_STATUS_PROCESS_CRASHED, -1);
   EXPECT_TRUE(web_contents->IsCrashed());
@@ skipping 12 matching lines @@
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        NavigateFromDefaultToOptionsInSameTab) {
   {
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     chrome::ShowSettings(browser());
     observer.Wait();
   }
   EXPECT_EQ(1, browser()->tab_count());
-  EXPECT_EQ(GetSettingsURL(), browser()->GetActiveWebContents()->GetURL());
+  EXPECT_EQ(GetSettingsURL(),
+            chrome::GetActiveWebContents(browser())->GetURL());
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        NavigateFromBlankToOptionsInSameTab) {
   browser::NavigateParams p(MakeNavigateParams());
   p.url = GURL(chrome::kAboutBlankURL);
   ui_test_utils::NavigateToURL(&p);
 
   {
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     chrome::ShowSettings(browser());
     observer.Wait();
   }
   EXPECT_EQ(1, browser()->tab_count());
-  EXPECT_EQ(GetSettingsURL(), browser()->GetActiveWebContents()->GetURL());
+  EXPECT_EQ(GetSettingsURL(),
+            chrome::GetActiveWebContents(browser())->GetURL());
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        NavigateFromNTPToOptionsInSameTab) {
   browser::NavigateParams p(MakeNavigateParams());
   p.url = GURL(chrome::kChromeUINewTabURL);
   ui_test_utils::NavigateToURL(&p);
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_EQ(GURL(chrome::kChromeUINewTabURL),
-            browser()->GetActiveWebContents()->GetURL());
+            chrome::GetActiveWebContents(browser())->GetURL());
 
   {
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     chrome::ShowSettings(browser());
     observer.Wait();
   }
   EXPECT_EQ(1, browser()->tab_count());
-  EXPECT_EQ(GetSettingsURL(), browser()->GetActiveWebContents()->GetURL());
+  EXPECT_EQ(GetSettingsURL(),
+            chrome::GetActiveWebContents(browser())->GetURL());
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        NavigateFromPageToOptionsInNewTab) {
   browser::NavigateParams p(MakeNavigateParams());
   ui_test_utils::NavigateToURL(&p);
-  EXPECT_EQ(GetGoogleURL(), browser()->GetActiveWebContents()->GetURL());
+  EXPECT_EQ(GetGoogleURL(), chrome::GetActiveWebContents(browser())->GetURL());
   EXPECT_EQ(1u, BrowserList::size());
   EXPECT_EQ(1, browser()->tab_count());
 
   {
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     chrome::ShowSettings(browser());
     observer.Wait();
   }
   EXPECT_EQ(2, browser()->tab_count());
-  EXPECT_EQ(GetSettingsURL(), browser()->GetActiveWebContents()->GetURL());
+  EXPECT_EQ(GetSettingsURL(),
+            chrome::GetActiveWebContents(browser())->GetURL());
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        NavigateFromNTPToOptionsSingleton) {
   {
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     chrome::ShowSettings(browser());
     observer.Wait();
   }
   EXPECT_EQ(1, browser()->tab_count());
 
   chrome::NewTab(browser());
   EXPECT_EQ(2, browser()->tab_count());
 
   {
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     chrome::ShowSettings(browser());
     observer.Wait();
   }
   EXPECT_EQ(2, browser()->tab_count());
-  EXPECT_EQ(GetSettingsURL(), browser()->GetActiveWebContents()->GetURL());
+  EXPECT_EQ(GetSettingsURL(),
+            chrome::GetActiveWebContents(browser())->GetURL());
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        NavigateFromNTPToOptionsPageInSameTab) {
   {
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     chrome::ShowClearBrowsingDataDialog(browser());
     observer.Wait();
   }
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_EQ(GetClearBrowsingDataURL(),
-            browser()->GetActiveWebContents()->GetURL());
+            chrome::GetActiveWebContents(browser())->GetURL());
 
   chrome::NewTab(browser());
   EXPECT_EQ(2, browser()->tab_count());
 
   {
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     chrome::ShowClearBrowsingDataDialog(browser());
     observer.Wait();
   }
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(GetClearBrowsingDataURL(),
-            browser()->GetActiveWebContents()->GetURL());
+            chrome::GetActiveWebContents(browser())->GetURL());
 }
 
 // Times out on mac, fails on linux.
 // http://crbug.com/119779
 #if defined(OS_MACOSX) || defined(OS_LINUX)
 #define MAYBE_NavigateFromOtherTabToSingletonOptions DISABLED_NavigateFromOtherTabToSingletonOptions
 #else
 #define MAYBE_NavigateFromOtherTabToSingletonOptions NavigatorFrameOtherTabToSingletonOptions
 #endif
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        MAYBE_NavigateFromOtherTabToSingletonOptions) {
   {
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     chrome::ShowSettings(browser());
     observer.Wait();
   }
   {
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
-    browser()->AddSelectedTabWithURL(
-        GetGoogleURL(), content::PAGE_TRANSITION_LINK);
+    chrome::AddSelectedTabWithURL(browser(), GetGoogleURL(),
+                                  content::PAGE_TRANSITION_LINK);
     observer.Wait();
   }
 
   {
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     chrome::ShowSettings(browser());
     observer.Wait();
   }
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(GetSettingsURL(),
-            browser()->GetActiveWebContents()->GetURL());
+            chrome::GetActiveWebContents(browser())->GetURL());
 }
 
 // Tests that when a new tab is opened from the omnibox, the focus is moved from
 // the omnibox for the current tab.
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        NavigateFromOmniboxIntoNewTab) {
   GURL url("http://www.google.com/");
   GURL url2("http://maps.google.com/");
 
   // Navigate to url.
@@ skipping 31 matching lines @@
                        DISABLED_NavigateFromDefaultToHistoryInSameTab) {
   {
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     chrome::ShowHistory(browser());
     observer.Wait();
   }
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_EQ(GURL(chrome::kChromeUIHistoryFrameURL),
-            browser()->GetActiveWebContents()->GetURL());
+            chrome::GetActiveWebContents(browser())->GetURL());
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        NavigateFromDefaultToBookmarksInSameTab) {
   {
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     chrome::ShowBookmarkManager(browser());
     observer.Wait();
   }
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_EQ(GURL(chrome::kChromeUIBookmarksURL),
-            browser()->GetActiveWebContents()->GetURL());
+            chrome::GetActiveWebContents(browser())->GetURL());
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
                        NavigateFromDefaultToDownloadsInSameTab) {
   {
     ui_test_utils::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     chrome::ShowDownloads(browser());
     observer.Wait();
   }
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_EQ(GURL(chrome::kChromeUIDownloadsURL),
-            browser()->GetActiveWebContents()->GetURL());
+            chrome::GetActiveWebContents(browser())->GetURL());
 }
 
 // This test makes sure any link in a crashed panel page navigates to a tabbed
 // window.
 class PanelBrowserNavigatorTest : public BrowserNavigatorTest {
  protected:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     command_line->AppendSwitch(switches::kEnablePanels);
   }
 };
@@ skipping 17 matching lines @@
   // Navigate() should have navigated in the existing panel window.
   EXPECT_EQ(panel_browser, p.browser);
 
   // We should now have two windows, the browser() provided by the framework and
   // the panel window we opened earlier. The tabbed browser window has 1 tab.
   EXPECT_EQ(2u, BrowserList::size());
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_EQ(1, panel_browser->tab_count());
 
   // Kill the panel page.
-  WebContents* web_contents = panel_browser->GetActiveWebContents();
+  WebContents* web_contents = chrome::GetActiveWebContents(panel_browser);
   web_contents->SetIsCrashed(base::TERMINATION_STATUS_PROCESS_CRASHED, -1);
   EXPECT_TRUE(web_contents->IsCrashed());
 
   // Navigate to the page.
   browser::NavigateParams p2(MakeNavigateParams(panel_browser));
-  p2.source_contents = panel_browser->GetActiveTabContents();
+  p2.source_contents = chrome::GetActiveTabContents(panel_browser);
   p2.url = url2;
   p2.disposition = CURRENT_TAB;
   browser::Navigate(&p2);
 
   // Navigate() should have opened a new tab in the existing tabbed window.
   EXPECT_EQ(browser(), p2.browser);
 
   // We should now have two windows, the browser() provided by the framework and
   // the panel window we opened earlier. The tabbed browser window has 2 tabs.
   EXPECT_EQ(2u, BrowserList::size());
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_EQ(1, panel_browser->tab_count());
 }
 
 } // namespace