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/test/webdriver | |
| 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/test/webdriver')
| -rw-r--r-- | chrome/test/webdriver/webdriver_automation.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chrome/test/webdriver/webdriver_automation.cc b/chrome/test/webdriver/webdriver_automation.cc index 769c572..d709cb1 100644 --- a/chrome/test/webdriver/webdriver_automation.cc +++ b/chrome/test/webdriver/webdriver_automation.cc @@ -286,7 +286,7 @@ class WebDriverAnonymousProxyLauncher : public AnonymousProxyLauncher { virtual ~WebDriverAnonymousProxyLauncher() {} virtual AutomationProxy* CreateAutomationProxy( - base::TimeDelta execution_timeout) OVERRIDE { + int execution_timeout) OVERRIDE { AutomationProxy* proxy = AnonymousProxyLauncher::CreateAutomationProxy(execution_timeout); AddBackwardsCompatFilter(proxy); @@ -302,7 +302,7 @@ class WebDriverNamedProxyLauncher : public NamedProxyLauncher { virtual ~WebDriverNamedProxyLauncher() {} virtual AutomationProxy* CreateAutomationProxy( - base::TimeDelta execution_timeout) OVERRIDE { + int execution_timeout) OVERRIDE { AutomationProxy* proxy = NamedProxyLauncher::CreateAutomationProxy(execution_timeout); // We can only add the filter here if the browser has not already been @@ -436,8 +436,7 @@ void Automation::Init( return; } - launcher_->automation()->set_action_timeout( - base::TimeDelta::FromMilliseconds(base::kNoTimeout)); + launcher_->automation()->set_action_timeout_ms(base::kNoTimeout); logger_.Log(kInfoLogLevel, "Connected to Chrome successfully. Version: " + automation()->server_version()); @@ -477,8 +476,7 @@ void Automation::Terminate() { kill(launcher_->process(), SIGTERM); int exit_code = -1; - if (!launcher_->WaitForBrowserProcessToQuit( - base::TimeDelta::FromSeconds(10), &exit_code)) { + if (!launcher_->WaitForBrowserProcessToQuit(10000, &exit_code)) { TerminateAllChromeProcesses(launcher_->process_id()); } base::CloseProcessHandle(launcher_->process()); |