Removing command_execution_timeout_ms in favor of action_max_timeout_ms.

chrome/test/automation/automation_proxy.h

 // 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 31 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_ms) = 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);
+  AutomationProxy(int action_timeout_ms, bool disconnect_on_failure);
   virtual ~AutomationProxy();
 
   // Creates a previously unused channel id.
   static std::string GenerateChannelID();
 
   // Initializes a channel for a connection to an AutomationProvider.
   // If use_named_interface is false, it will act as a client
   // and connect to the named IPC socket with channel_id as its path.
   // If use_named_interface is true, it will act as a server and
   // use an anonymous socketpair instead.
   void InitializeChannel(const std::string& channel_id,
                          bool use_named_interface);
 
   // IPC callback
   virtual bool OnMessageReceived(const IPC::Message& msg);
   virtual void OnChannelError();
 
   // Close the automation IPC channel.
   void Disconnect();
 
   // Waits for the app to launch and the automation provider to say hello
   // (the app isn't fully done loading by this point).
   // Returns SUCCESS if the launch is successful.
-  // Returns TIMEOUT if there was no response by command_execution_timeout_
+  // Returns TIMEOUT if there was no response by action_timeout_
   // Returns VERSION_MISMATCH if the automation protocol version of the
   // automation provider does not match and if perform_version_check_ is set
   // to true. Note that perform_version_check_ defaults to false, call
   // set_perform_version_check() to set it.
   AutomationLaunchResult WaitForAppLaunch();
 
   // See description in AutomationMsg_WaitForProcessLauncherThreadToGoIdle.
   bool WaitForProcessLauncherThreadToGoIdle() WARN_UNUSED_RESULT;
 
   // Waits for any initial page loads to complete.
@@ skipping 110 matching lines @@
                                                  bool with_ui);
 
   // Asserts that the next extension test result is true.
   void EnsureExtensionTestResult();
 
   // Resets to the default theme. Returns true on success.
   bool ResetToDefaultTheme();
 
   // Generic pattern for sending automation requests.
   bool SendJSONRequest(const std::string& request,
+                       int timeout_ms,
                        std::string* response) WARN_UNUSED_RESULT;
 
 #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;
 
   // 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());
+  int action_timeout_ms() const {
+    return static_cast<int>(action_timeout_.InMilliseconds());
   }
 
   // Sets the timeout for subsequent automation calls.
-  void set_command_execution_timeout_ms(int timeout_ms) {
+  void set_action_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);
+    action_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
@@ skipping 34 matching lines @@
   // the automation provider at connection time. Defaults to false, you can
   // set this to true if building the automation proxy into a module with
   // a version resource.
   bool perform_version_check_;
 
   // If true, the proxy will disconnect the IPC channel on first failure
   // to send an IPC message. This helps avoid long timeouts in tests.
   bool disconnect_on_failure_;
 
   // Delay to let the browser execute the command.
-  base::TimeDelta command_execution_timeout_;
+  base::TimeDelta action_timeout_;
 
   base::PlatformThreadId listener_thread_id_;
 
   DISALLOW_COPY_AND_ASSIGN(AutomationProxy);
 };
 
 #endif  // CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H_