Remove test_timeout_ms and fix all the callers.

chrome/test/selenium/selenium_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.
 
 // This is a gTest-based test that runs the Selenium Core testsuite in Chrome
 // using the UITest automation.  The number of total and failed tests are
 // written to stdout.
 //
 // TODO(darin): output the names of the failed tests so we can easily track
 // deviations from the expected output.
 
 #include <list>
 #include <set>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_split.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/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/base/net_util.h"
 
 #ifdef SIMULATE_RUN
 #include "base/rand_util.h"
 #endif
@@ skipping 74 matching lines @@
     test_path = test_path.AppendASCII("data");
     test_path = test_path.AppendASCII("selenium_core");
     test_path = test_path.AppendASCII("core");
     test_path = test_path.AppendASCII("TestRunner.html");
 
     GURL test_url(net::FilePathToFileURL(test_path));
     scoped_refptr<TabProxy> tab(GetActiveTab());
     tab->NavigateToURL(test_url);
 
     // Wait for the test to finish.
-    ASSERT_TRUE(WaitUntilCookieValue(tab.get(), test_url, "__tests_finished",
-                                     UITest::test_timeout_ms(), "1"));
+    ASSERT_TRUE(WaitUntilCookieValue(
+        tab.get(), test_url, "__tests_finished",
+        TestTimeouts::huge_test_timeout_ms(), "1"));
 
     std::string cookie;
     ASSERT_TRUE(tab->GetCookieByName(test_url, "__num_tests_total", &cookie));
     total->swap(UTF8ToWide(cookie));
     ASSERT_FALSE(total->empty());
     ASSERT_TRUE(tab->GetCookieByName(test_url, "__tests_failed", &cookie));
     failed->swap(UTF8ToWide(cookie));
     // The __tests_failed cookie will be empty if all the tests pass.
 #endif
   }
@@ skipping 42 matching lines @@
   }
 
   if (!new_passes_list.empty()) {
     printf("new tests passing:\n");
     ResultsList::const_iterator it = new_passes_list.begin();
     for (; it != new_passes_list.end(); ++it)
       printf("  %s\n", it->c_str());
     printf("\n");
   }
 }