Remove test_timeout_ms and fix all the callers.

chrome/test/ui/ui_test.h

-// 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.
 
 #ifndef CHROME_TEST_UI_UI_TEST_H_
 #define CHROME_TEST_UI_UI_TEST_H_
 #pragma once
 
 // This file provides a common base for running UI unit tests, which operate
 // the entire browser application in a separate process for holistic
 // functional testing.
@@ skipping 233 matching lines @@
   // TODO(phajdan.jr): update callers and remove these.
   static int command_execution_timeout_ms() {
     return TestTimeouts::command_execution_timeout_ms();
   }
   static int action_timeout_ms() {
     return TestTimeouts::action_timeout_ms();
   }
   static int action_max_timeout_ms() {
     return TestTimeouts::action_max_timeout_ms();
   }
-  static int test_timeout_ms() {
-    return TestTimeouts::huge_test_timeout_ms();
-  }
 
   // Fetch the state which determines whether the profile will be cleared on
   // next startup.
   bool get_clear_profile() const {
     return clear_profile_;
   }
   // Sets clear_profile_. Should be called before launching browser to have
   // any effect.
   void set_clear_profile(bool clear_profile) {
     clear_profile_ = clear_profile;
@@ skipping 243 matching lines @@
 #ifdef UNIT_TEST
 std::ostream& operator<<(std::ostream& out, const std::wstring& wstr);
 
 template<typename T>
 std::ostream& operator<<(std::ostream& out, const ::scoped_ptr<T>& ptr) {
   return out << ptr.get();
 }
 #endif  // UNIT_TEST
 
 #endif  // CHROME_TEST_UI_UI_TEST_H_