Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3758)

Unified Diff: chrome/test/automation/automation_json_requests.cc

Issue 6685099: Removing command_execution_timeout_ms in favor of action_max_timeout_ms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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(

Powered by Google App Engine
This is Rietveld 408576698