summaryrefslogtreecommitdiffstats
path: root/chrome/browser/unload_uitest.cc
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/browser/unload_uitest.cc
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/browser/unload_uitest.cc')
-rw-r--r--chrome/browser/unload_uitest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/unload_uitest.cc b/chrome/browser/unload_uitest.cc
index 7eb6f4f..63886cf 100644
--- a/chrome/browser/unload_uitest.cc
+++ b/chrome/browser/unload_uitest.cc
@@ -433,7 +433,7 @@ TEST_F(UnloadTest, MAYBE_BrowserCloseTabWhenOtherTabHasListener) {
// popup will be constrained, which isn't what we want to test.
ASSERT_TRUE(window->SimulateOSClick(tab_view_bounds.CenterPoint(),
views::Event::EF_LEFT_BUTTON_DOWN));
- ASSERT_TRUE(browser->WaitForTabCountToBecome(2, action_timeout_ms()));
+ ASSERT_TRUE(browser->WaitForTabCountToBecome(2));
scoped_refptr<TabProxy> popup_tab(browser->GetActiveTab());
ASSERT_TRUE(popup_tab.get());
@@ -442,7 +442,7 @@ TEST_F(UnloadTest, MAYBE_BrowserCloseTabWhenOtherTabHasListener) {
EXPECT_EQ(std::wstring(L"popup"), popup_title);
EXPECT_TRUE(popup_tab->Close(true));
- ASSERT_TRUE(browser->WaitForTabCountToBecome(1, action_timeout_ms()));
+ ASSERT_TRUE(browser->WaitForTabCountToBecome(1));
scoped_refptr<TabProxy> main_tab(browser->GetActiveTab());
ASSERT_TRUE(main_tab.get());
std::wstring main_title;