diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-25 21:56:10 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-25 21:56:10 +0000 |
| commit | a37d4b081fa9c311c30e233fb1160d6d0af1353e (patch) | |
| tree | f87ca96ad3c4793a7f4d2a08170a1b5db06189db /chrome/browser/captive_portal | |
| parent | 51b9a6b2fef24656af23c20a167ea81bedbeaa2a (diff) | |
| download | chromium_src-a37d4b081fa9c311c30e233fb1160d6d0af1353e.zip chromium_src-a37d4b081fa9c311c30e233fb1160d6d0af1353e.tar.gz chromium_src-a37d4b081fa9c311c30e233fb1160d6d0af1353e.tar.bz2 | |
Move browser commands into a separate file.
http://crbug.com/133576
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10657016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144028 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/captive_portal')
| -rw-r--r-- | chrome/browser/captive_portal/captive_portal_browsertest.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/captive_portal/captive_portal_browsertest.cc b/chrome/browser/captive_portal/captive_portal_browsertest.cc index bad23d3..de6c359 100644 --- a/chrome/browser/captive_portal/captive_portal_browsertest.cc +++ b/chrome/browser/captive_portal/captive_portal_browsertest.cc @@ -21,6 +21,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_commands.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h" @@ -1467,7 +1468,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, CloseLoginTab) { FailLoadsWithoutLogin(browser(), 1); // Close login tab. - browser()->CloseTab(); + chrome::CloseTab(browser()); // Go through the standard slow load login, and make sure it still works. SlowLoadBehindCaptivePortal(browser(), true); @@ -1524,7 +1525,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, AbortLoad) { // Switch back to the hung tab from the login tab, and abort the navigation. browser()->ActivateTabAt(0, true); - browser()->Stop(); + chrome::Stop(browser()); navigation_observer.WaitForNavigations(1); EXPECT_EQ(0, NumBrokenTabs()); @@ -1617,7 +1618,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, GoBack) { // Activate the error page tab again and go back. browser()->ActivateTabAt(0, true); - browser()->GoBack(CURRENT_TAB); + chrome::GoBack(browser(), CURRENT_TAB); navigation_observer.WaitForNavigations(1); EXPECT_EQ(1, navigation_observer.NumNavigationsForTab( @@ -1652,7 +1653,7 @@ IN_PROC_BROWSER_TEST_F(CaptivePortalBrowserTest, GoBackToTimeout) { // Go to the error page. MultiNavigationObserver navigation_observer; CaptivePortalObserver portal_observer(browser()->profile()); - browser()->GoBack(CURRENT_TAB); + chrome::GoBack(browser(), CURRENT_TAB); // Wait for both the check triggered by the broken tab and the first load // of the login tab, and for the login tab to stop loading. |