Removing command_execution_timeout_ms in favor of action_max_timeout_ms.

chrome/test/automation/browser_proxy.cc

Index: chrome/test/automation/browser_proxy.cc
===================================================================
--- chrome/test/automation/browser_proxy.cc	(revision 79305)
+++ chrome/test/automation/browser_proxy.cc	(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.
 
@@ -8,6 +8,7 @@
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
+#include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
 #include "base/time.h"
 #include "chrome/common/automation_constants.h"
@@ -577,6 +578,12 @@
 
 bool BrowserProxy::SendJSONRequest(const std::string& request,
                                    std::string* response) {
+  return SendJSONRequest(request, response,
+      TestTimeouts::action_max_timeout_ms());
+}
+
+bool BrowserProxy::SendJSONRequest(const std::string& request,
+                                   std::string* response, int timeout) {
   if (!is_valid())
     return false;
 
@@ -584,7 +591,8 @@
   if (!sender_->Send(new AutomationMsg_SendJSONRequest(handle_,
                                                        request,
                                                        response,
-                                                       &result)))
+                                                       &result),
+                                                       timeout))
     return false;
   return result;
 }