Chromium Code Reviews| 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 |