summaryrefslogtreecommitdiffstats
path: root/chrome/test/interactive_ui
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-03 23:55:15 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-03 23:55:15 +0000
commit54cea0fd87a8ad562d6ad403b22c5a9b4722ff3b (patch)
tree1591db9bbe04b443feb1c0fc385b68130e08b6b6 /chrome/test/interactive_ui
parentf9ff629f7e67baf59700abceacbdfb0c6014211a (diff)
downloadchromium_src-54cea0fd87a8ad562d6ad403b22c5a9b4722ff3b.zip
chromium_src-54cea0fd87a8ad562d6ad403b22c5a9b4722ff3b.tar.gz
chromium_src-54cea0fd87a8ad562d6ad403b22c5a9b4722ff3b.tar.bz2
GTTF: Make WaitForTabCountToBecome automation call not Sleep.
Sleeping is an unreliable method to wait for things. Instead, we set up an observer. BUG=none TEST=none Review URL: http://codereview.chromium.org/3300011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58563 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/interactive_ui')
-rw-r--r--chrome/test/interactive_ui/keyboard_access_uitest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/interactive_ui/keyboard_access_uitest.cc b/chrome/test/interactive_ui/keyboard_access_uitest.cc
index d002a3e..a8ee85d 100644
--- a/chrome/test/interactive_ui/keyboard_access_uitest.cc
+++ b/chrome/test/interactive_ui/keyboard_access_uitest.cc
@@ -87,7 +87,7 @@ void KeyboardAccessTest::TestMenuKeyboardAccess(bool alternate_key_sequence) {
ASSERT_TRUE(window->SimulateOSKeyPress(app::VKEY_RETURN, 0));
// Wait for the new tab to appear.
- ASSERT_TRUE(browser->WaitForTabCountToBecome(2, action_timeout_ms()));
+ ASSERT_TRUE(browser->WaitForTabCountToBecome(2));
// Make sure that the new tab index is 1.
ASSERT_TRUE(browser->GetActiveTabIndex(&tab_index));
@@ -132,7 +132,7 @@ TEST_F(KeyboardAccessTest, FAILS_ReserveKeyboardAccelerators) {
ASSERT_TRUE(browser->ActivateTab(1));
ASSERT_TRUE(window->SimulateOSKeyPress(
app::VKEY_F4, views::Event::EF_CONTROL_DOWN));
- ASSERT_TRUE(browser->WaitForTabCountToBecome(1, action_max_timeout_ms()));
+ ASSERT_TRUE(browser->WaitForTabCountToBecome(1));
#endif
}