Removing command_execution_timeout_ms in favor of action_max_timeout_ms.

chrome/test/automation/automation_proxy.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 CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H_
 #define CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
@@ skipping 30 matching lines @@
   // received or a timeout has expired.
   //
   // The function returns true if a response is received, and returns false if
   // there is a failure or timeout (in milliseconds).
   //
   // NOTE: When timeout occurs, the connection between proxy provider may be
   //       in transit state. Specifically, there might be pending IPC messages,
   //       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
 // a running instance of the app.
 class AutomationProxy : public IPC::Channel::Listener,
                         public AutomationMessageSender {
  public:
   AutomationProxy(int command_execution_timeout_ms, bool disconnect_on_failure);
   virtual ~AutomationProxy();
 
@@ skipping 148 matching lines @@
   // Returns true on success.
   bool GetEnabledExtensions(std::vector<FilePath>* extension_directories);
 
   // Resets to the default theme. Returns true on success.
   bool ResetToDefaultTheme();
 
   // Generic pattern for sending automation requests.
   bool SendJSONRequest(const std::string& request,
                        std::string* response) WARN_UNUSED_RESULT;
 
+  bool SendJSONRequest(const std::string& request,
+                       std::string* response,
+                       int timeout) WARN_UNUSED_RESULT;

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

nit: Similarly here, please remove the version that doesn't have the |timeout|
parameter.

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

Done.

+
 #if defined(OS_CHROMEOS)
   // Logs in through the Chrome OS login wizard with given |username|
   // and |password|.  Returns true on success.
   bool LoginWithUserAndPass(const std::string& username,
                             const std::string& password) WARN_UNUSED_RESULT;
 #endif
 
 #if defined(OS_POSIX)
   base::file_handle_mapping_vector fds_to_map() const;
 #endif
 
   // AutomationMessageSender implementation.
   virtual bool Send(IPC::Message* message) WARN_UNUSED_RESULT;
+  virtual bool Send(IPC::Message* message, int timeout_ms) WARN_UNUSED_RESULT;

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

Just in case you ask, IMHO it's fine and even preferred to have both versions of
this method. Send is used much more often.

 
   // Wrapper over AutomationHandleTracker::InvalidateHandle. Receives the
   // message from AutomationProxy, unpacks the messages and routes that call to
   // the tracker.
   virtual void InvalidateHandle(const IPC::Message& message);
 
   // Creates a tab that can hosted in an external process. The function
   // returns a TabProxy representing the tab as well as a window handle
   // that can be reparented in another process.
   scoped_refptr<TabProxy> CreateExternalTab(
       const ExternalTabSettings& settings,
       gfx::NativeWindow* external_tab_container,
       gfx::NativeWindow* tab);
 
-  int command_execution_timeout_ms() const {
-    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.
   std::string server_version() const {
     return server_version_;
   }
 
   // Call this while passing true to tell the automation proxy to perform
   // a version check when WaitForAppLaunch() is called. Note that
   // platform_version_check_ defaults to false.
@@ skipping 40 matching lines @@
 
   // Delay to let the browser execute the command.
   base::TimeDelta command_execution_timeout_;
 
   base::PlatformThreadId listener_thread_id_;
 
   DISALLOW_COPY_AND_ASSIGN(AutomationProxy);
 };
 
 #endif  // CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H_