Remove test_timeout_ms and fix all the callers.

chrome/test/ui/sunspider_uitest.cc

Index: chrome/test/ui/sunspider_uitest.cc
diff --git a/chrome/test/ui/sunspider_uitest.cc b/chrome/test/ui/sunspider_uitest.cc
index fe6659940d5c26446ff109ebbfed85f20aeb1ad7..bcc8ff6afa21e5108b4072dfa9fd3256df34bceb 100644
--- a/chrome/test/ui/sunspider_uitest.cc
+++ b/chrome/test/ui/sunspider_uitest.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -6,6 +6,7 @@
 #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"
@@ -61,7 +62,7 @@ class SunSpiderTest : public UIPerfTest {
 
   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 GetTotal(TabProxy* tab, std::string* total) {