diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-23 16:21:28 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-23 16:21:28 +0000 |
| commit | 1d000681ef18ea1ebd39a19bf17a7bfccd3ed352 (patch) | |
| tree | ba970b56596e6ea791b260227a8a7d73ffc696e8 /chrome/browser/browser_keyevents_browsertest.cc | |
| parent | 6679aafaaa6a213759623e4a056281d209158523 (diff) | |
| download | chromium_src-1d000681ef18ea1ebd39a19bf17a7bfccd3ed352.zip chromium_src-1d000681ef18ea1ebd39a19bf17a7bfccd3ed352.tar.gz chromium_src-1d000681ef18ea1ebd39a19bf17a7bfccd3ed352.tar.bz2 | |
Adds ui_test_utils::SendAndWaitForKeyPress and converts callers (where
appropriate) to use it. Hopefully this will help isolate why tests are
failing on bot.
BUG=none
TEST=none; test only change.
Review URL: http://codereview.chromium.org/3117030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57064 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_keyevents_browsertest.cc')
| -rw-r--r-- | chrome/browser/browser_keyevents_browsertest.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/browser_keyevents_browsertest.cc b/chrome/browser/browser_keyevents_browsertest.cc index 89f8c08..87a6bedf 100644 --- a/chrome/browser/browser_keyevents_browsertest.cc +++ b/chrome/browser/browser_keyevents_browsertest.cc @@ -149,10 +149,8 @@ class BrowserKeyEventsTest : public InProcessBrowserTest { bool command) { gfx::NativeWindow window = NULL; ASSERT_NO_FATAL_FAILURE(GetNativeWindow(&window)); - EXPECT_TRUE(ui_controls::SendKeyPressNotifyWhenDone( - window, key, control, shift, alt, command, - new MessageLoop::QuitTask())); - ui_test_utils::RunMessageLoop(); + ASSERT_TRUE(ui_test_utils::SendKeyPressSync( + window, key, control, shift, alt, command)); } bool IsViewFocused(ViewID vid) { @@ -790,7 +788,7 @@ IN_PROC_BROWSER_TEST_F(BrowserKeyEventsTest, MAYBE_ReservedAccelerators) { // Ctrl+F4 to close the tab. ASSERT_NO_FATAL_FAILURE(SuppressAllEvents(0, true)); - ASSERT_NO_FATAL_FAILURE( SendKey(base::VKEY_F4, true, false, false, false)); + ASSERT_NO_FATAL_FAILURE(SendKey(base::VKEY_F4, true, false, false, false)); ASSERT_EQ(1, browser()->tab_count()); #endif } |