Removing command_execution_timeout_ms in favor of action_max_timeout_ms.

R=jcivelli@chromium.org,sky@chromium.org,phajdan.jr@chromium.org,nirnimesh@chromium.org
Review URL: http://codereview.chromium.org/6685099

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81164 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 5 insertions, 19 deletions

diff --git a/base/test/test_switches.cc b/base/test/test_switches.cc
index 991f4f3..d4491ee 100644
--- a/base/test/test_switches.cc
+++ b/base/test/test_switches.cc
@@ -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.
 
@@ -13,6 +13,5 @@ const char switches::kTestLargeTimeout[] = "test-large-timeout";
 const char switches::kTestTinyTimeout[] = "test-tiny-timeout";
 const char switches::kUiTestActionTimeout[] = "ui-test-action-timeout";
 const char switches::kUiTestActionMaxTimeout[] = "ui-test-action-max-timeout";
-const char switches::kUiTestCommandExecutionTimeout[] = "ui-test-timeout";
 const char switches::kUiTestTerminateTimeout[] = "ui-test-terminate-timeout";
 const char switches::kUiTestTimeout[] = "test-timeout";
diff --git a/base/test/test_switches.h b/base/test/test_switches.h
index 44ebd23..81891cb6 100644
--- a/base/test/test_switches.h
+++ b/base/test/test_switches.h
@@ -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.
 
@@ -14,7 +14,6 @@ extern const char kTestLargeTimeout[];
 extern const char kTestTinyTimeout[];
 extern const char kUiTestActionTimeout[];
 extern const char kUiTestActionMaxTimeout[];
-extern const char kUiTestCommandExecutionTimeout[];
 extern const char kUiTestTerminateTimeout[];
 extern const char kUiTestTimeout[];
 
diff --git a/base/test/test_timeouts.cc b/base/test/test_timeouts.cc
index 20cd8a9..1d86b2c 100644
--- a/base/test/test_timeouts.cc
+++ b/base/test/test_timeouts.cc
@@ -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 @@ bool TestTimeouts::initialized_ = false;
 // 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 @@ void TestTimeouts::Initialize() {
   CHECK(action_max_timeout_ms_ <= large_test_timeout_ms_);
   CHECK(large_test_timeout_ms_ <= huge_test_timeout_ms_);
 
-  InitializeTimeout(switches::kUiTestCommandExecutionTimeout,
-                    &command_execution_timeout_ms_);
   InitializeTimeout(switches::kUiTestTerminateTimeout,
                     &wait_for_terminate_timeout_ms_);
 
diff --git a/base/test/test_timeouts.h b/base/test/test_timeouts.h
index f4cb1ff..64df11a 100644
--- a/base/test/test_timeouts.h
+++ b/base/test/test_timeouts.h
@@ -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.
 
@@ -35,12 +35,6 @@ class TestTimeouts {
   // 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_;
@@ -60,7 +54,6 @@ class TestTimeouts {
   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_;