Remove test_timeout_ms and fix all the callers.

chrome/test/ui/dromaeo_benchmark_uitest.cc

-// Copyright (c) 2009 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 "base/values.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/javascript_test_util.h"
 #include "chrome/test/ui/ui_perf_test.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 
@@ skipping 33 matching lines @@
  private:
   // Return the path to the dromaeo benchmark directory on the local filesystem.
   FilePath GetDromaeoDir() {
     FilePath test_dir;
     PathService::Get(chrome::DIR_TEST_DATA, &test_dir);
     return test_dir.AppendASCII("dromaeo");
   }
 
   bool WaitUntilTestCompletes(TabProxy* tab, const GURL& test_url) {
     return WaitUntilCookieValue(tab, test_url, "__done",
-                                UITest::test_timeout_ms(), "1");
+                                TestTimeouts::huge_test_timeout_ms(), "1");
   }
 
   bool GetScore(TabProxy* tab, std::string* score) {
     std::wstring score_wide;
     bool succeeded = tab->ExecuteAndExtractString(L"",
         L"window.domAutomationController.send(automation.GetScore());",
         &score_wide);
 
     // Note that we don't use ASSERT_TRUE here (and in some other places) as it
     // doesn't work inside a function with a return type other than void.
@@ skipping 93 matching lines @@
 
 TEST_F(DromaeoReferenceTest, JSLibPerf) {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDromaeo))
     return;
 
   RunTest(FILE_PATH_LITERAL("jslib"));
 }
 
 
 }  // namespace