Remove obsolete test timeouts and convert callers.

chrome/test/perf/url_fetch_test.cc

 // 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_number_conversions.h"
 #include "base/string_util.h"
@@ skipping 36 matching lines @@
                const std::string& wait_js_frame_xpath,
                int wait_js_timeout_ms,
                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,
-            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()) {
       bool completed = WaitUntilJavaScriptCondition(
           tab.get(),
           UTF8ToWide(wait_js_frame_xpath),
           UTF8ToWide(wait_js_expr),
           wait_js_timeout_ms);
       ASSERT_TRUE(completed);
     }
@@ skipping 99 matching lines @@
 
   // Write out the JS Variable if requested
   FilePath jsvar_output_path = cmd_line->GetSwitchValuePath("jsvar_output");
   if (!jsvar_output_path.value().empty()) {
     ASSERT_TRUE(WriteValueToFile(result.javascript_variable,
                                  jsvar_output_path));
   }
 }
 
 }  // namespace