Set url fetch test timeout back to old values. Increase UI test command timeo...

chrome/test/url_fetch_test/url_fetch_test.cc

 // Copyright (c) 2010 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 "chrome/common/chrome_paths.h"
@@ skipping 24 matching lines @@
 #if defined(OS_WIN)
       dir = dir.AppendASCII("chrome");
 #elif defined(OS_LINUX)
       dir = dir.AppendASCII("chrome_linux");
 #elif defined(OS_MACOSX)
       dir = dir.AppendASCII("chrome_mac");
 #endif
       browser_directory_ = dir;
     }
     UITest::SetUp();
+
+    // We've shortened the default timeouts, but dom_perf on Vista needs longer
+    // timeouts. Setting timeouts to the previous values before r52666.
+    set_action_timeout_ms(std::max(60000, action_timeout_ms()));

[Paweł Hajdan Jr., 2010/07/19 18:29:10]

Please do it via a command-line flag, not in the code. Could you do a follow-up
CL?

[Lei Zhang, 2010/07/19 18:49:01]

Sure, it was 2 AM and I needed to plug the hole.

   }
 
   void RunTest(const GURL& url, const char* wait_cookie_name,
                const char* wait_cookie_value, const wchar_t* 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) {
@@ skipping 80 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