diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-13 21:38:37 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-13 21:38:37 +0000 |
| commit | 7e712a839266bd3d046e8420c67c739968940c6c (patch) | |
| tree | 06e60cb855cc4acddb199cfc322e42769b679976 /chrome_frame/chrome_frame_automation.cc | |
| parent | a39ca1650e8ee83553a2c91c6712a71647fa2ff1 (diff) | |
| download | chromium_src-7e712a839266bd3d046e8420c67c739968940c6c.zip chromium_src-7e712a839266bd3d046e8420c67c739968940c6c.tar.gz chromium_src-7e712a839266bd3d046e8420c67c739968940c6c.tar.bz2 | |
Revert 146656 - Switch to TimeDelta interfaces in chrome automation test infrastructure.
BUG=108171
Review URL: https://chromiumcodereview.appspot.com/10736064
TBR=tedvessenes@gmail.com
Review URL: https://chromiumcodereview.appspot.com/10781003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146658 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_automation.cc')
| -rw-r--r-- | chrome_frame/chrome_frame_automation.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome_frame/chrome_frame_automation.cc b/chrome_frame/chrome_frame_automation.cc index 12f14cf..9a649c0 100644 --- a/chrome_frame/chrome_frame_automation.cc +++ b/chrome_frame/chrome_frame_automation.cc @@ -134,7 +134,7 @@ class ChromeFrameAutomationProxyImpl::CFMsgDispatcher ChromeFrameAutomationProxyImpl::ChromeFrameAutomationProxyImpl( AutomationProxyCacheEntry* entry, - std::string channel_id, base::TimeDelta launch_timeout) + std::string channel_id, int launch_timeout) : AutomationProxy(launch_timeout, false), proxy_entry_(entry) { TRACE_EVENT_BEGIN_ETW("chromeframe.automationproxy", this, ""); @@ -251,10 +251,8 @@ void AutomationProxyCacheEntry::CreateProxy(ChromeFrameLaunchParams* params, // At same time we must destroy/stop the thread from another thread. std::string channel_id = AutomationProxy::GenerateChannelID(); ChromeFrameAutomationProxyImpl* proxy = - new ChromeFrameAutomationProxyImpl( - this, - channel_id, - base::TimeDelta::FromMilliseconds(params->launch_timeout())); + new ChromeFrameAutomationProxyImpl(this, channel_id, + params->launch_timeout()); // Ensure that the automation proxy actually respects our choice on whether // or not to check the version. |