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/browser_keyevents_browsertest.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/browser_keyevents_browsertest.cc')
| -rw-r--r-- | chrome/browser/browser_keyevents_browsertest.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc index 2feeb61..0e8bb09 100644 --- a/chrome/browser/browser_keyevents_browsertest.cc +++ b/chrome/browser/browser_keyevents_browsertest.cc @@ -650,7 +650,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, AccessKeys) { } // Disabled, http://crbug.com/69475. -IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_ReservedAccelerators) { +IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, ReservedAccelerators) { ASSERT_TRUE(test_server()->Start()); ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); @@ -680,10 +680,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, DISABLED_ReservedAccelerators) { // Press Ctrl/Cmd+T, which will open a new tab. It cannot be suppressed. EXPECT_NO_FATAL_FAILURE(TestKeyEvent(0, kTestCtrlOrCmdT)); - - ASSERT_NO_FATAL_FAILURE( - wait_for_new_tab.WaitFor(Source<TabContentsWrapper>( - browser()->GetTabContentsWrapperAt(1)))); + wait_for_new_tab.Wait(); int result_length; ASSERT_NO_FATAL_FAILURE(GetResultLength(0, &result_length)); |