diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 22:37:31 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 22:37:31 +0000 |
| commit | d64295933cbfd3bc984e851412cc79c8a0870acf (patch) | |
| tree | 8026b726dc498f4fa6f3e886b1612541ac6f0214 /chrome/worker | |
| parent | 4f2063cce10295e8b982e98d466c9130d754a540 (diff) | |
| download | chromium_src-d64295933cbfd3bc984e851412cc79c8a0870acf.zip chromium_src-d64295933cbfd3bc984e851412cc79c8a0870acf.tar.gz chromium_src-d64295933cbfd3bc984e851412cc79c8a0870acf.tar.bz2 | |
Remove action_max_timeout_ms and fix all the callers.
(This was a TODO for phajdan.jr).
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/6354005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker')
| -rw-r--r-- | chrome/worker/worker_uitest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc index 936f134..cb83f77 100644 --- a/chrome/worker/worker_uitest.cc +++ b/chrome/worker/worker_uitest.cc @@ -48,7 +48,7 @@ class WorkerTest : public UILayoutTest { ASSERT_TRUE(tab->NavigateToURL(url)); std::string value = WaitUntilCookieNonEmpty(tab.get(), url, - kTestCompleteCookie, action_max_timeout_ms()); + kTestCompleteCookie, TestTimeouts::action_max_timeout_ms()); ASSERT_STREQ(kTestCompleteSuccess, value.c_str()); } @@ -71,7 +71,7 @@ class WorkerTest : public UILayoutTest { ASSERT_TRUE(tab->NavigateToURL(url)); std::string value = WaitUntilCookieNonEmpty(tab.get(), url, - kTestCompleteCookie, action_max_timeout_ms()); + kTestCompleteCookie, TestTimeouts::action_max_timeout_ms()); // Close the incognito window ASSERT_TRUE(incognito->RunCommand(IDC_CLOSE_WINDOW)); @@ -607,7 +607,7 @@ TEST_F(WorkerTest, FLAKY_WorkerClose) { FilePath(kWorkerClose)); ASSERT_TRUE(tab->NavigateToURL(url)); std::string value = WaitUntilCookieNonEmpty(tab.get(), url, - kTestCompleteCookie, action_max_timeout_ms()); + kTestCompleteCookie, TestTimeouts::action_max_timeout_ms()); ASSERT_STREQ(kTestCompleteSuccess, value.c_str()); ASSERT_TRUE(WaitForProcessCountToBe(1, 0)); } @@ -624,7 +624,7 @@ TEST_F(WorkerTest, QueuedSharedWorkerShutdown) { ASSERT_TRUE(tab.get()); ASSERT_TRUE(tab->NavigateToURL(url)); std::string value = WaitUntilCookieNonEmpty(tab.get(), url, - kTestCompleteCookie, action_max_timeout_ms()); + kTestCompleteCookie, TestTimeouts::action_max_timeout_ms()); ASSERT_STREQ(kTestCompleteSuccess, value.c_str()); ASSERT_TRUE(WaitForProcessCountToBe(1, max_workers_per_tab)); } @@ -658,7 +658,7 @@ TEST_F(WorkerTest, FLAKY_MultipleTabsQueuedSharedWorker) { ASSERT_TRUE(window->AppendTab(url2)); std::string value = WaitUntilCookieNonEmpty(tab.get(), url, - kTestCompleteCookie, action_max_timeout_ms()); + kTestCompleteCookie, TestTimeouts::action_max_timeout_ms()); ASSERT_STREQ(kTestCompleteSuccess, value.c_str()); ASSERT_TRUE(WaitForProcessCountToBe(3, max_workers_per_tab)); } @@ -687,7 +687,7 @@ TEST_F(WorkerTest, FLAKY_QueuedSharedWorkerStartedFromOtherTab) { ASSERT_TRUE(window->AppendTab(url2)); std::string value = WaitUntilCookieNonEmpty(tab.get(), url, - kTestCompleteCookie, action_max_timeout_ms()); + kTestCompleteCookie, TestTimeouts::action_max_timeout_ms()); ASSERT_STREQ(kTestCompleteSuccess, value.c_str()); ASSERT_TRUE(WaitForProcessCountToBe(2, max_workers_per_tab+1)); } |