Removing command_execution_timeout_ms in favor of action_max_timeout_ms.

chrome/test/automation/automation_proxy.h

Index: chrome/test/automation/automation_proxy.h
===================================================================
--- chrome/test/automation/automation_proxy.h	(revision 79305)
+++ chrome/test/automation/automation_proxy.h	(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.
 
@@ -49,6 +49,7 @@
   //       and the proxy provider might be still working on the previous
   //       request.
   virtual bool Send(IPC::Message* message) = 0;
+  virtual bool Send(IPC::Message* message, int timeout) = 0;
 };
 
 // This is the interface that external processes can use to interact with
@@ -215,7 +216,8 @@
 
   // Generic pattern for sending automation requests.
   bool SendJSONRequest(const std::string& request,
-                       std::string* response) WARN_UNUSED_RESULT;
+                       std::string* response,
+                       int timeout) WARN_UNUSED_RESULT;
 
 #if defined(OS_CHROMEOS)
   // Logs in through the Chrome OS login wizard with given |username|
@@ -230,6 +232,7 @@
 
   // AutomationMessageSender implementation.
   virtual bool Send(IPC::Message* message) WARN_UNUSED_RESULT;
+  virtual bool Send(IPC::Message* message, int timeout_ms) WARN_UNUSED_RESULT;
 
   // Wrapper over AutomationHandleTracker::InvalidateHandle. Receives the
   // message from AutomationProxy, unpacks the messages and routes that call to
@@ -244,17 +247,6 @@
       gfx::NativeWindow* external_tab_container,
       gfx::NativeWindow* tab);
 
-  int command_execution_timeout_ms() const {

[Nirnimesh, 2011/03/29 20:27:28]

Please add corresponding getter/setter for action_max_timeout_ms.

We sometimes need to temporarily change these from pyauto.

[Huyen, 2011/03/31 02:42:55]

Done.

-    return static_cast<int>(command_execution_timeout_.InMilliseconds());
-  }
-
-  // Sets the timeout for subsequent automation calls.
-  void set_command_execution_timeout_ms(int timeout_ms) {
-    DCHECK(timeout_ms <= 10 * 60 * 1000 ) << "10+ min of automation timeout "
-        "can make the test hang and be killed by buildbot";
-    command_execution_timeout_ = base::TimeDelta::FromMilliseconds(timeout_ms);
-  }
-
   // Returns the server version of the server connected. You may only call this
   // method after WaitForAppLaunch() has returned SUCCESS or VERSION_MISMATCH.
   // If you call it before this, the return value is undefined.