Remove test_timeout_ms and fix all the callers.

chrome/test/url_fetch_test/url_fetch_test.cc

-// 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.
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
+#include "base/test/test_timeouts.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 
 namespace {
 
 // Provides a UI Test that lets us take the browser to a url, and
 // wait for a cookie value to be set before closing the page.
 class UrlFetchTest : public UITest {
@@ skipping 26 matching lines @@
   }
 
   void RunTest(const GURL& url, const char* wait_cookie_name,
                const char* wait_cookie_value, const char* var_to_fetch,
                UrlFetchTestResult* result) {
     scoped_refptr<TabProxy> tab(GetActiveTab());
     ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(url));
 
     if (wait_cookie_name) {
       if (wait_cookie_value) {
-        bool completed = WaitUntilCookieValue(tab.get(), url, wait_cookie_name,
-                                              UITest::test_timeout_ms(),
-                                              wait_cookie_value);
+        bool completed = WaitUntilCookieValue(
+            tab.get(), url, wait_cookie_name,
+            TestTimeouts::huge_test_timeout_ms(),
+            wait_cookie_value);
         ASSERT_TRUE(completed);
       } else {
         result->cookie_value = WaitUntilCookieNonEmpty(
-            tab.get(), url, wait_cookie_name, UITest::test_timeout_ms());
+            tab.get(), url, wait_cookie_name,
+            TestTimeouts::huge_test_timeout_ms());
         ASSERT_TRUE(result->cookie_value.length());
       }
     }
     if (var_to_fetch) {
       std::string script = StringPrintf(
           "window.domAutomationController.send(%s);", var_to_fetch);
 
       std::wstring value;
       bool success = tab->ExecuteAndExtractString(L"", ASCIIToWide(script),
                                                   &value);
@@ skipping 64 matching lines @@
 
   // Write out the JS Variable if requested
   FilePath jsvar_output_path = cmd_line->GetSwitchValuePath("jsvar_output");
   if (jsvar_output_path.value().size() > 0) {
     ASSERT_TRUE(WriteValueToFile(result.javascript_variable,
                                  jsvar_output_path));
   }
 }
 
 }  // namespace