Remove obsolete test timeouts and convert callers.

This will make it easier to choose the right timeout.

BUG=none

Review URL: http://codereview.chromium.org/7744031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98273 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 12 insertions, 12 deletions

diff --git a/chrome/browser/ui/webui/bookmarks_ui_uitest.cc b/chrome/browser/ui/webui/bookmarks_ui_uitest.cc
index 1900e8c..4dba8a8 100644
--- a/chrome/browser/ui/webui/bookmarks_ui_uitest.cc
+++ b/chrome/browser/ui/webui/bookmarks_ui_uitest.cc
@@ -23,7 +23,7 @@ class BookmarksUITest : public UITest {
         L"domAutomationController.send("
         L"    location.protocol == 'chrome-extension:' && "
         L"    document.readyState == 'complete')",
-        TestTimeouts::huge_test_timeout_ms());
+        TestTimeouts::large_test_timeout_ms());
   }
 
   scoped_refptr<TabProxy> GetBookmarksUITab() {
diff --git a/chrome/browser/ui/webui/options/options_ui_uitest.cc b/chrome/browser/ui/webui/options/options_ui_uitest.cc
index b680e4e..0330062 100644
--- a/chrome/browser/ui/webui/options/options_ui_uitest.cc
+++ b/chrome/browser/ui/webui/options/options_ui_uitest.cc
@@ -31,7 +31,7 @@ class OptionsUITest : public UITest {
         L"domAutomationController.send("
         L"    location.protocol == 'chrome:' && "
         L"    document.readyState == 'complete')",
-        TestTimeouts::huge_test_timeout_ms());
+        TestTimeouts::large_test_timeout_ms());
   }
 
   scoped_refptr<TabProxy> GetOptionsUITab() {
diff --git a/chrome/test/gpu/webgl_conformance_tests.cc b/chrome/test/gpu/webgl_conformance_tests.cc
index 5ad9bc8..103a841 100644
--- a/chrome/test/gpu/webgl_conformance_tests.cc
+++ b/chrome/test/gpu/webgl_conformance_tests.cc
@@ -67,7 +67,7 @@ class WebGLConformanceTests : public UITest {
     // Block until the test completes.
     ASSERT_TRUE(WaitUntilJavaScriptCondition(
         tab, L"", L"window.domAutomationController.send(!running);",
-        TestTimeouts::huge_test_timeout_ms()));
+        TestTimeouts::large_test_timeout_ms()));
 
     // Read out the test result.
     std::wstring result, message;
diff --git a/chrome/test/live_sync/live_sync_test.cc b/chrome/test/live_sync/live_sync_test.cc
index b3c319b..cd87d21 100644
--- a/chrome/test/live_sync/live_sync_test.cc
+++ b/chrome/test/live_sync/live_sync_test.cc
@@ -441,7 +441,7 @@ bool LiveSyncTest::SetUpLocalTestServer() {
   if (!base::LaunchProcess(server_cmdline, options, &test_server_handle_))
     LOG(ERROR) << "Could not launch local test server.";
 
-  const int kMaxWaitTime = TestTimeouts::live_operation_timeout_ms();
+  const int kMaxWaitTime = TestTimeouts::action_max_timeout_ms();
   const int kNumIntervals = 15;
   if (WaitForTestServerToStart(kMaxWaitTime, kNumIntervals)) {
     VLOG(1) << "Started local test server at "
diff --git a/chrome/test/perf/dom_checker_uitest.cc b/chrome/test/perf/dom_checker_uitest.cc
index 4196666..deceb9e 100644
--- a/chrome/test/perf/dom_checker_uitest.cc
+++ b/chrome/test/perf/dom_checker_uitest.cc
@@ -145,7 +145,7 @@ class DomCheckerTest : public UITest {
   bool WaitUntilTestCompletes(TabProxy* tab) {
     return WaitUntilJavaScriptCondition(tab, L"",
         L"window.domAutomationController.send(automation.IsDone());",
-        TestTimeouts::huge_test_timeout_ms());
+        TestTimeouts::large_test_timeout_ms());
   }
 
   bool GetTestCount(TabProxy* tab, int* test_count) {
diff --git a/chrome/test/perf/dromaeo_benchmark_uitest.cc b/chrome/test/perf/dromaeo_benchmark_uitest.cc
index 58755b2..d3b5225 100644
--- a/chrome/test/perf/dromaeo_benchmark_uitest.cc
+++ b/chrome/test/perf/dromaeo_benchmark_uitest.cc
@@ -60,7 +60,7 @@ class DromaeoTest : public UIPerfTest {
 
   bool WaitUntilTestCompletes(TabProxy* tab, const GURL& test_url) {
     return WaitUntilCookieValue(tab, test_url, "__done",
-                                TestTimeouts::huge_test_timeout_ms(), "1");
+                                TestTimeouts::large_test_timeout_ms(), "1");
   }
 
   bool GetScore(TabProxy* tab, std::string* score) {
diff --git a/chrome/test/perf/frame_rate/frame_rate_tests.cc b/chrome/test/perf/frame_rate/frame_rate_tests.cc
index 08c9e6b..a9a1991 100644
--- a/chrome/test/perf/frame_rate/frame_rate_tests.cc
+++ b/chrome/test/perf/frame_rate/frame_rate_tests.cc
@@ -54,7 +54,7 @@ class FrameRateTest : public UIPerfTest {
     // Block until the tests completes.
     ASSERT_TRUE(WaitUntilJavaScriptCondition(
         tab, L"", L"window.domAutomationController.send(!__running_all);",
-        TestTimeouts::huge_test_timeout_ms()));
+        TestTimeouts::large_test_timeout_ms()));
 
     // Read out the results.
     std::wstring json;
diff --git a/chrome/test/perf/page_cycler_test.cc b/chrome/test/perf/page_cycler_test.cc
index 592fc15..e07e36b 100644
--- a/chrome/test/perf/page_cycler_test.cc
+++ b/chrome/test/perf/page_cycler_test.cc
@@ -190,7 +190,7 @@ class PageCyclerTest : public UIPerfTest {
     // Wait for the test to finish.
     ASSERT_TRUE(WaitUntilCookieValue(
         tab.get(), test_url, "__pc_done",
-        TestTimeouts::huge_test_timeout_ms(), "1"));
+        TestTimeouts::large_test_timeout_ms(), "1"));
 
     std::string cookie;
     ASSERT_TRUE(tab->GetCookieByName(test_url, "__pc_pages", &cookie));
diff --git a/chrome/test/perf/sunspider_uitest.cc b/chrome/test/perf/sunspider_uitest.cc
index 0e976d0..6024cf9 100644
--- a/chrome/test/perf/sunspider_uitest.cc
+++ b/chrome/test/perf/sunspider_uitest.cc
@@ -62,7 +62,7 @@ class SunSpiderTest : public UIPerfTest {
 
   bool WaitUntilTestCompletes(TabProxy* tab, const GURL& test_url) {
     return WaitUntilCookieValue(tab, test_url, "__done",
-                                TestTimeouts::huge_test_timeout_ms(), "1");
+                                TestTimeouts::large_test_timeout_ms(), "1");
   }
 
   bool GetTotal(TabProxy* tab, std::string* total) {
diff --git a/chrome/test/perf/url_fetch_test.cc b/chrome/test/perf/url_fetch_test.cc
index 67becf8..faa2c4f 100644
--- a/chrome/test/perf/url_fetch_test.cc
+++ b/chrome/test/perf/url_fetch_test.cc
@@ -54,13 +54,13 @@ class UrlFetchTest : public UIPerfTest {
       if (wait_cookie_value) {
         bool completed = WaitUntilCookieValue(
             tab.get(), url, wait_cookie_name,
-            TestTimeouts::huge_test_timeout_ms(),
+            TestTimeouts::large_test_timeout_ms(),
             wait_cookie_value);
         ASSERT_TRUE(completed);
       } else {
         result->cookie_value = WaitUntilCookieNonEmpty(
             tab.get(), url, wait_cookie_name,
-            TestTimeouts::huge_test_timeout_ms());
+            TestTimeouts::large_test_timeout_ms());
         ASSERT_TRUE(result->cookie_value.length());
       }
     } else if (!wait_js_expr.empty()) {
diff --git a/chrome/test/perf/v8_benchmark_uitest.cc b/chrome/test/perf/v8_benchmark_uitest.cc
index 3fb5737..969b61f 100644
--- a/chrome/test/perf/v8_benchmark_uitest.cc
+++ b/chrome/test/perf/v8_benchmark_uitest.cc
@@ -63,7 +63,7 @@ class V8BenchmarkTest : public UIPerfTest {
 
   bool WaitUntilTestCompletes(TabProxy* tab, const GURL& test_url) {
     return WaitUntilCookieValue(tab, test_url, "__done",
-                                TestTimeouts::huge_test_timeout_ms(), "1");
+                                TestTimeouts::large_test_timeout_ms(), "1");
   }
 
   bool GetScore(TabProxy* tab, std::string* score) {