diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-12 12:02:45 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-12 12:02:45 +0000 |
| commit | ef6200adcf7b7e10a1d3bc221ea6135a34133010 (patch) | |
| tree | 5360d6741dfdb4e9e4a0c180df4d7e84b4bdcf10 /chrome/test/page_cycler/page_cycler_test.cc | |
| parent | dec720ec4bef489c3ada09f0cf075def343098bc (diff) | |
| download | chromium_src-ef6200adcf7b7e10a1d3bc221ea6135a34133010.zip chromium_src-ef6200adcf7b7e10a1d3bc221ea6135a34133010.tar.gz chromium_src-ef6200adcf7b7e10a1d3bc221ea6135a34133010.tar.bz2 | |
Remove test_timeout_ms and fix all the callers.
(This was a TODO for phajdan.jr).
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/6188004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71158 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/page_cycler/page_cycler_test.cc')
| -rw-r--r-- | chrome/test/page_cycler/page_cycler_test.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/test/page_cycler/page_cycler_test.cc b/chrome/test/page_cycler/page_cycler_test.cc index 6dce15e..f86d175 100644 --- a/chrome/test/page_cycler/page_cycler_test.cc +++ b/chrome/test/page_cycler/page_cycler_test.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -10,6 +10,7 @@ #include "base/process_util.h" #include "base/string_number_conversions.h" #include "base/sys_string_conversions.h" +#include "base/test/test_timeouts.h" #include "base/utf_string_conversions.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/common/chrome_constants.h" @@ -239,8 +240,9 @@ class PageCyclerTest : public UIPerfTest { ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(test_url)); // Wait for the test to finish. - ASSERT_TRUE(WaitUntilCookieValue(tab.get(), test_url, "__pc_done", - UITest::test_timeout_ms(), "1")); + ASSERT_TRUE(WaitUntilCookieValue( + tab.get(), test_url, "__pc_done", + TestTimeouts::huge_test_timeout_ms(), "1")); std::string cookie; ASSERT_TRUE(tab->GetCookieByName(test_url, "__pc_pages", &cookie)); |