Removing command_execution_timeout_ms in favor of action_max_timeout_ms.

chrome/test/automation/browser_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/browser_proxy.h"
 
 #include <algorithm>
 
 #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"
 #include "chrome/common/automation_messages.h"
 #include "chrome/test/automation/autocomplete_edit_proxy.h"
 #include "chrome/test/automation/automation_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "ui/gfx/point.h"
 
@@ skipping 549 matching lines @@
     return false;
 
   bool result = false;
   if (!sender_->Send(new AutomationMsg_WaitForPopupMenuToOpen(&result)))
     return false;
   return result;
 }
 
 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;
 
   bool result = false;
   if (!sender_->Send(new AutomationMsg_SendJSONRequest(handle_,
                                                        request,
                                                        response,
-                                                       &result)))
+                                                       &result),
+                                                       timeout))
     return false;
   return result;
 }
 
 bool BrowserProxy::GetInitialLoadTimes(float* min_start_time,
                                        float* max_stop_time,
                                        std::vector<float>* stop_times) {
   std::string json_response;
   const char* kJSONCommand = "{\"command\": \"GetInitialLoadTimes\"}";
 
@@ skipping 43 matching lines @@
     if (i == 0)
       *min_start_time = start_ms;
 
     *min_start_time = std::min(start_ms, *min_start_time);
     *max_stop_time = std::max(stop_ms, *max_stop_time);
     stop_times->push_back(stop_ms);
   }
   std::sort(stop_times->begin(), stop_times->end());
   return true;
 }