Removing command_execution_timeout_ms in favor of action_max_timeout_ms.

base/test/test_timeouts.cc

Index: base/test/test_timeouts.cc
===================================================================
--- base/test/test_timeouts.cc	(revision 79305)
+++ base/test/test_timeouts.cc	(working copy)
@@ -1,4 +1,4 @@
-// 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.
 
@@ -44,14 +44,11 @@
 // static
 int TestTimeouts::tiny_timeout_ms_ = 100;
 int TestTimeouts::action_timeout_ms_ = 2000;
-int TestTimeouts::action_max_timeout_ms_ = 20000;
+int TestTimeouts::action_max_timeout_ms_ = 25000;
 int TestTimeouts::large_test_timeout_ms_ = 3 * 60 * 1000;
 int TestTimeouts::huge_test_timeout_ms_ = 10 * 60 * 1000;
 
 // static
-int TestTimeouts::command_execution_timeout_ms_ = 25000;
-
-// static
 int TestTimeouts::wait_for_terminate_timeout_ms_ = 15000;
 
 // static
@@ -83,8 +80,6 @@
   CHECK(action_max_timeout_ms_ <= large_test_timeout_ms_);
   CHECK(large_test_timeout_ms_ <= huge_test_timeout_ms_);
 
-  InitializeTimeout(switches::kUiTestCommandExecutionTimeout,

[Paweł Hajdan Jr., 2011/03/26 10:55:12]

Oh, please also remove kUiTestCommandExecutionTimeout from
base/test/test_switches.

[Huyen, 2011/03/29 00:11:39]

Done.

-                    &command_execution_timeout_ms_);
   InitializeTimeout(switches::kUiTestTerminateTimeout,
                     &wait_for_terminate_timeout_ms_);