Removing command_execution_timeout_ms in favor of action_max_timeout_ms.

chrome/test/automation/automation_json_requests.cc

 // 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_json_requests.h"
 
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
+#include "base/test/test_timeouts.h"
 #include "chrome/common/automation_messages.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/test/automation/automation_proxy.h"
 
 namespace {
 
 bool SendAutomationJSONRequest(AutomationMessageSender* sender,
                                const DictionaryValue& request_dict,
                                DictionaryValue* reply_dict) {
   std::string request, reply;
   base::JSONWriter::Write(&request_dict, false, &request);
   bool success = false;
-  if (!SendAutomationJSONRequest(sender, request, &reply, &success))
+  if (!SendAutomationJSONRequest(sender, request,
+      TestTimeouts::action_max_timeout_ms(), &reply, &success))

[Paweł Hajdan Jr., 2011/04/08 11:04:53]

nit: +4 indentation here please as said before.

[Huyen, 2011/04/09 00:08:15]

Done.

     return false;
   scoped_ptr<Value> value(base::JSONReader::Read(reply, true));
   if (!value.get() || !value->IsType(Value::TYPE_DICTIONARY)) {
     std::string command;
     request_dict.GetString("command", &command);
     LOG(ERROR) << "JSON request did not return dict: " << command << "\n";
     return false;
   }
   DictionaryValue* dict = static_cast<DictionaryValue*>(value.get());
   if (!success) {
@@ skipping 16 matching lines @@
                          const std::string& modified_text,
                          int modifiers)
     : type(type),
       key_code(key_code),
       unmodified_text(unmodified_text),
       modified_text(modified_text),
       modifiers(modifiers) {}
 
 bool SendAutomationJSONRequest(AutomationMessageSender* sender,
                                const std::string& request,
+                               int timeout_ms,
                                std::string* reply,
                                bool* success) {
   return sender->Send(new AutomationMsg_SendJSONRequest(
-      -1, request, reply, success));
+      -1, request, reply, success), timeout_ms);
 }
 
 bool SendGetIndicesFromTabIdJSONRequest(
     AutomationMessageSender* sender,
     int tab_id,
     int* browser_index,
     int* tab_index) {
   DictionaryValue request_dict;
   request_dict.SetString("command", "GetIndicesFromTab");
   request_dict.SetInteger("tab_id", tab_id);
@@ skipping 390 matching lines @@
   return SendAutomationJSONRequest(sender, dict, &reply_dict);
 }
 
 bool SendWaitForAllTabsToStopLoadingJSONRequest(
     AutomationMessageSender* sender) {
   DictionaryValue dict;
   dict.SetString("command", "WaitForAllTabsToStopLoading");
   DictionaryValue reply_dict;
   return SendAutomationJSONRequest(sender, dict, &reply_dict);
 }