Removing command_execution_timeout_ms in favor of action_max_timeout_ms.

chrome/test/automation/automation_proxy.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 "chrome/test/automation/automation_proxy.h"
 
 #include <gtest/gtest.h>
 
 #include <sstream>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/threading/platform_thread.h"
 #include "base/process_util.h"
 #include "base/ref_counted.h"
 #include "base/synchronization/waitable_event.h"
+#include "base/test/test_timeouts.h"
 #include "chrome/common/automation_constants.h"
 #include "chrome/common/automation_messages.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/test/automation/automation_json_requests.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/extension_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "ipc/ipc_descriptors.h"
 #if defined(OS_WIN)
@@ skipping 414 matching lines @@
 base::file_handle_mapping_vector AutomationProxy::fds_to_map() const {
   base::file_handle_mapping_vector map;
   const int ipcfd = channel_->GetClientFileDescriptor();
   if (ipcfd > -1)
     map.push_back(std::make_pair(ipcfd, kPrimaryIPCChannel + 3));
   return map;
 }
 #endif  // defined(OS_POSIX)
 
 bool AutomationProxy::Send(IPC::Message* message) {
+  return Send(message,
+    command_execution_timeout_.InMilliseconds());
+}
+
+bool AutomationProxy::Send(IPC::Message* message, int timeout_ms) {
   if (!channel_.get()) {
     LOG(ERROR) << "Automation channel has been closed; dropping message!";
     delete message;
     return false;
   }
 
-  bool success = channel_->SendWithTimeout(message,
-                                           command_execution_timeout_ms());
+  bool success = channel_->SendWithTimeout(message, timeout_ms);
 
   if (!success && disconnect_on_failure_) {
     // Send failed (possibly due to a timeout). Browser is likely in a weird
     // state, and further IPC requests are extremely likely to fail (possibly
     // timeout, which would make tests slower). Disconnect the channel now
     // to avoid the slowness.
     LOG(ERROR) << "Disconnecting channel after error!";
     Disconnect();
   }
 
@@ skipping 84 matching lines @@
   return Send(new AutomationMsg_ResetToDefaultTheme());
 }
 
 bool AutomationProxy::SendJSONRequest(const std::string& request,
                                       std::string* response) {
   bool result = false;
   if (!SendAutomationJSONRequest(this, request, response, &result))
     return false;
   return result;
 }
+
+bool AutomationProxy::SendJSONRequest(const std::string& request,
+                                      std::string* response, int timeout) {
+  bool result = false;
+  if (!SendAutomationJSONRequest(this, request, response, &result, timeout))
+    return false;
+  return result;
+}