summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test_utils.cc
diff options
context:
space:
mode:
authorcpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-13 21:38:37 +0000
committercpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-13 21:38:37 +0000
commit7e712a839266bd3d046e8420c67c739968940c6c (patch)
tree06e60cb855cc4acddb199cfc322e42769b679976 /chrome_frame/test_utils.cc
parenta39ca1650e8ee83553a2c91c6712a71647fa2ff1 (diff)
downloadchromium_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/test_utils.cc')
-rw-r--r--chrome_frame/test_utils.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome_frame/test_utils.cc b/chrome_frame/test_utils.cc
index ef8a288..2333cc6 100644
--- a/chrome_frame/test_utils.cc
+++ b/chrome_frame/test_utils.cc
@@ -113,9 +113,8 @@ void ScopedChromeFrameRegistrar::DoRegistration(
<< registration_command;
} else {
base::win::ScopedHandle rundll32(process_handle);
- if (!base::WaitForExitCodeWithTimeout(
- process_handle, &exit_code,
- base::TimeDelta::FromMilliseconds(kDllRegistrationTimeoutMs))) {
+ if (!base::WaitForExitCodeWithTimeout(process_handle, &exit_code,
+ kDllRegistrationTimeoutMs)) {
LOG(ERROR) << "Timeout waiting to register or unregister DLL with "
"command: " << registration_command;
base::KillProcess(process_handle, 0, false);