| Index: chrome/test/automation/automation_proxy.cc
|
| diff --git a/chrome/test/automation/automation_proxy.cc b/chrome/test/automation/automation_proxy.cc
|
| index 0137200a2a765952ae076a3a7155bd78e812a137..d5f1a60e7eef8c1fed7b632be998446a43c22095 100644
|
| --- a/chrome/test/automation/automation_proxy.cc
|
| +++ b/chrome/test/automation/automation_proxy.cc
|
| @@ -97,7 +97,7 @@ class AutomationMessageFilter : public IPC::ChannelProxy::MessageFilter {
|
| } // anonymous namespace
|
|
|
|
|
| -AutomationProxy::AutomationProxy(int action_timeout_ms,
|
| +AutomationProxy::AutomationProxy(base::TimeDelta action_timeout,
|
| bool disconnect_on_failure)
|
| : app_launched_(true, false),
|
| initial_loads_complete_(true, false),
|
| @@ -106,13 +106,12 @@ AutomationProxy::AutomationProxy(int action_timeout_ms,
|
| perform_version_check_(false),
|
| disconnect_on_failure_(disconnect_on_failure),
|
| channel_disconnected_on_failure_(false),
|
| - action_timeout_(
|
| - TimeDelta::FromMilliseconds(action_timeout_ms)),
|
| + action_timeout_(action_timeout),
|
| listener_thread_id_(0) {
|
| // base::WaitableEvent::TimedWait() will choke if we give it a negative value.
|
| // Zero also seems unreasonable, since we need to wait for IPC, but at
|
| // least it is legal... ;-)
|
| - DCHECK_GE(action_timeout_ms, 0);
|
| + DCHECK_GE(action_timeout.InMilliseconds(), 0);
|
| listener_thread_id_ = base::PlatformThread::CurrentId();
|
| InitializeHandleTracker();
|
| InitializeThread();
|
|
|