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

Unified Diff: chrome/test/automation/automation_proxy.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_proxy.cc
===================================================================
--- chrome/test/automation/automation_proxy.cc (revision 78587)
+++ chrome/test/automation/automation_proxy.cc (working copy)
@@ -448,14 +448,18 @@
#endif // defined(OS_POSIX)
bool AutomationProxy::Send(IPC::Message* message) {
+ return Send(message,
+ AutomationProxy::command_execution_timeout_.InMilliseconds());
Paweł Hajdan Jr. 2011/03/19 10:21:34 nit: We're in AutomationProxy, there is no need fo
+}
+
+bool AutomationProxy::Send(IPC::Message* message, int timeout_ms) {
if (!channel_.get()) {
LOG(ERROR) << "Automation channel has been closed; dropping message!";
delete message;
return false;
}
- bool success = channel_->SendWithTimeout(message,
- command_execution_timeout_ms());
+ bool success = channel_->SendWithTimeout(message, timeout_ms);
if (!success && disconnect_on_failure_) {
// Send failed (possibly due to a timeout). Browser is likely in a weird

Powered by Google App Engine
This is Rietveld 408576698