Removing command_execution_timeout_ms in favor of action_max_timeout_ms.

base/test/test_timeouts.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 BASE_TEST_TEST_TIMEOUTS_H_
 #define BASE_TEST_TEST_TIMEOUTS_H_
 
 #include "base/basictypes.h"
 
 // Returns common timeouts to use in tests. Makes it possible to adjust
 // the timeouts for different environments (like Valgrind).
@@ skipping 16 matching lines @@
   static int action_max_timeout_ms() { return action_max_timeout_ms_; }
 
   // Timeout for a large test that may take a few minutes to run.
   static int large_test_timeout_ms() { return large_test_timeout_ms_; }
 
   // Timeout for a huge test (like running a layout test inside the browser).
   // Do not use unless absolutely necessary - try to make the test smaller.
   // Do not use multiple times in a single test.
   static int huge_test_timeout_ms() { return huge_test_timeout_ms_; }
 
-  // Timeout to use for AutomationProxy. Do not use in other places.
-  // TODO(phajdan.jr): Remove command_execution_timeout_ms.
-  static int command_execution_timeout_ms() {
-    return command_execution_timeout_ms_;
-  }
-
   // Timeout to wait for a process to terminate.
   static int wait_for_terminate_timeout_ms() {
     return wait_for_terminate_timeout_ms_;
   }
 
   // Timeout to wait for a live operation to complete. Used by tests that access
   // external services.
   static int live_operation_timeout_ms() {
     return live_operation_timeout_ms_;
   }
 
  private:
   static bool initialized_;
 
   static int tiny_timeout_ms_;
   static int action_timeout_ms_;
   static int action_max_timeout_ms_;
   static int large_test_timeout_ms_;
   static int huge_test_timeout_ms_;
-  static int command_execution_timeout_ms_;
   static int wait_for_terminate_timeout_ms_;
   static int live_operation_timeout_ms_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(TestTimeouts);
 };
 
 #endif  // BASE_TEST_TEST_TIMEOUTS_H_