Removing command_execution_timeout_ms in favor of action_max_timeout_ms.

base/test/test_timeouts.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/test/test_timeouts.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/test/test_switches.h"
 
@@ skipping 25 matching lines @@
 
 }  // namespace
 
 // static
 bool TestTimeouts::initialized_ = false;
 
 // The timeout values should increase in the order they appear in this block.
 // 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
 int TestTimeouts::live_operation_timeout_ms_ = 45000;
 
 // static
 void TestTimeouts::Initialize() {
   if (initialized_) {
     NOTREACHED();
     return;
@@ skipping 11 matching lines @@
                     &large_test_timeout_ms_);
   InitializeTimeout(switches::kUiTestTimeout, large_test_timeout_ms_,
                     &huge_test_timeout_ms_);
 
   // The timeout values should be increasing in the right order.
   CHECK(tiny_timeout_ms_ <= action_timeout_ms_);
   CHECK(action_timeout_ms_ <= action_max_timeout_ms_);
   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_);
 
   InitializeTimeout(switches::kLiveOperationTimeout,
                     &live_operation_timeout_ms_);
 }