Index: chrome/test/automation/automation_json_requests.cc |
=================================================================== |
--- chrome/test/automation/automation_json_requests.cc (revision 79305) |
+++ chrome/test/automation/automation_json_requests.cc (working copy) |
@@ -8,6 +8,7 @@ |
#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" |
@@ -59,8 +60,17 @@ |
const std::string& request, |
std::string* reply, |
bool* success) { |
+ return SendAutomationJSONRequest(sender, request, reply, success, |
+ TestTimeouts::action_max_timeout_ms()); |
+} |
+ |
+bool SendAutomationJSONRequest(AutomationMessageSender* sender, |
+ const std::string& request, |
+ std::string* reply, |
+ bool* success, |
+ int timeout) { |
return sender->Send(new AutomationMsg_SendJSONRequest( |
- -1, request, reply, success)); |
+ -1, request, reply, success), timeout); |
} |
bool SendGetIndicesFromTabIdJSONRequest( |