diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-08 22:04:40 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-08 22:04:40 +0000 |
| commit | e04c7eacaa5092fa740c5ac330f4b8f01755fc2d (patch) | |
| tree | 1cfd82a2b49c98aa26ab83767f821726ed8ad687 /chrome/test/interactive_ui | |
| parent | a233a64c05fa151f0a9d1eff6839962d23d82b17 (diff) | |
| download | chromium_src-e04c7eacaa5092fa740c5ac330f4b8f01755fc2d.zip chromium_src-e04c7eacaa5092fa740c5ac330f4b8f01755fc2d.tar.gz chromium_src-e04c7eacaa5092fa740c5ac330f4b8f01755fc2d.tar.bz2 | |
GTTF: Make WaitForInfoBarCount not Sleep.
Use an observer instead, to wait more reliably.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3344006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58880 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/interactive_ui')
| -rw-r--r-- | chrome/test/interactive_ui/infobars_uitest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/test/interactive_ui/infobars_uitest.cc b/chrome/test/interactive_ui/infobars_uitest.cc index 34d1bda..def82d5 100644 --- a/chrome/test/interactive_ui/infobars_uitest.cc +++ b/chrome/test/interactive_ui/infobars_uitest.cc @@ -31,7 +31,7 @@ TEST_F(InfoBarsUITest, TestInfoBarsCloseOnNewTheme) { test_data_directory_.AppendASCII("extensions").AppendASCII("theme.crx"), true); ASSERT_TRUE(theme != NULL); - EXPECT_TRUE(tab_1->WaitForInfoBarCount(1, action_max_timeout_ms())); + EXPECT_TRUE(tab_1->WaitForInfoBarCount(1)); EXPECT_TRUE(browser->AppendTab( test_server.GetURL("files/simple.html"))); @@ -42,9 +42,9 @@ TEST_F(InfoBarsUITest, TestInfoBarsCloseOnNewTheme) { test_data_directory_.AppendASCII("extensions").AppendASCII("theme2.crx"), true); ASSERT_TRUE(theme != NULL); - EXPECT_TRUE(tab_2->WaitForInfoBarCount(1, action_max_timeout_ms())); - EXPECT_TRUE(tab_1->WaitForInfoBarCount(0, action_max_timeout_ms())); + EXPECT_TRUE(tab_2->WaitForInfoBarCount(1)); + EXPECT_TRUE(tab_1->WaitForInfoBarCount(0)); EXPECT_TRUE(automation()->ResetToDefaultTheme()); - EXPECT_TRUE(tab_2->WaitForInfoBarCount(0, action_max_timeout_ms())); + EXPECT_TRUE(tab_2->WaitForInfoBarCount(0)); } |