Remove test_timeout_ms and fix all the callers.

chrome/test/ui/dom_checker_uitest.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.
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/string_split.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/chrome_switches.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 
@@ skipping 115 matching lines @@
                                                      &expected_failures_text);
     if (!have_expected_results)
       return false;
     ParseExpectedFailures(expected_failures_text, expected_failures);
     return true;
   }
 
   bool WaitUntilTestCompletes(TabProxy* tab) {
     return WaitUntilJavaScriptCondition(tab, L"",
         L"window.domAutomationController.send(automation.IsDone());",
-        UITest::test_timeout_ms());
+        TestTimeouts::huge_test_timeout_ms());
   }
 
   bool GetTestCount(TabProxy* tab, int* test_count) {
     return tab->ExecuteAndExtractInt(L"",
         L"window.domAutomationController.send(automation.GetTestCount());",
         test_count);
   }
 
   bool GetTestsFailed(TabProxy* tab, ResultsSet* tests_failed) {
     std::wstring json_wide;
@@ skipping 86 matching lines @@
 TEST_F(DomCheckerTest, FAILS_Http) {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDomCheckerTest))
     return;
 
   ResultsList new_passes, new_failures;
   RunTest(true, &new_passes, &new_failures);
   PrintResults(new_passes, new_failures);
 }
 
 }  // namespace