diff options
author | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 19:48:37 +0000 |
---|---|---|
committer | gbillock@chromium.org <gbillock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 19:48:37 +0000 |
commit | ae67374948bc8c9009025972683cb1ba15b3ef9d (patch) | |
tree | a2c838f7ff06304cf3ea260d82f8811ce0d5e0f4 /chrome/browser/ui/browser_navigator_browsertest_chromeos.cc | |
parent | e5f0856d2676944b01ecb2b01c4f18fe2bc0bd77 (diff) | |
download | chromium_src-ae67374948bc8c9009025972683cb1ba15b3ef9d.zip chromium_src-ae67374948bc8c9009025972683cb1ba15b3ef9d.tar.gz chromium_src-ae67374948bc8c9009025972683cb1ba15b3ef9d.tar.bz2 |
Remove a couple racy functions from ui_test_utils.
Un-disable the ReservedAccelerators test. Now seems to pass linux debug.
Get rid of usage of WaitForNavigationInCurrentTab
R=phajdan.jr@chromium.org
BUG=69475
TEST=browser_tests.*,interactive_ui_tests.*,ui_tests.*
Review URL: http://codereview.chromium.org/7693013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98093 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser_navigator_browsertest_chromeos.cc')
-rw-r--r-- | chrome/browser/ui/browser_navigator_browsertest_chromeos.cc | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc b/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc index 02a7560..085e079 100644 --- a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc +++ b/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc @@ -63,11 +63,9 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_LargePopup) { browser::NavigateParams p(MakeNavigateParams()); p.disposition = NEW_POPUP; p.window_bounds = gfx::Rect(0, 0, 10000, 10000); - browser::Navigate(&p); - // Wait for page to load. - ui_test_utils::WaitForNavigationInCurrentTab(p.browser); + ui_test_utils::NavigateToURL(&p); - // Navigate() should have opened a new tab. + // NavigateToURL() should have opened a new tab. EXPECT_EQ(browser(), p.browser); // We should have one window with two tabs. @@ -83,21 +81,15 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_LargePopupFromPopup) { browser::NavigateParams p1(MakeNavigateParams()); p1.disposition = NEW_POPUP; p1.window_bounds = gfx::Rect(0, 0, 200, 200); - browser::Navigate(&p1); - - // Wait for page to load. - ui_test_utils::WaitForNavigationInCurrentTab(p1.browser); + ui_test_utils::NavigateToURL(&p1); // Open a large popup from the popup. browser::NavigateParams p2(MakeNavigateParams(p1.browser)); p2.disposition = NEW_POPUP; p2.window_bounds = gfx::Rect(0, 0, 10000, 10000); - browser::Navigate(&p2); - - // Wait for page to load. - ui_test_utils::WaitForNavigationInCurrentTab(p2.browser); + ui_test_utils::NavigateToURL(&p2); - // Navigate() should have opened a new tab in the primary browser. + // NavigateToURL() should have opened a new tab in the primary browser. EXPECT_EQ(browser(), p2.browser); // We should have two windows. browser() should have two tabs. |