summaryrefslogtreecommitdiffstats
path: root/dbus
diff options
context:
space:
mode:
authortedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-09 19:24:36 +0000
committertedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-09 19:24:36 +0000
commit951a721171ac8d03a7670b942e66055aace111fe (patch)
tree51c4b2a8c08879176845976c97b919c6f3e3afa5 /dbus
parent6a7e667865d0d9ea9f8ff8a01bedc8369bb7f34d (diff)
downloadchromium_src-951a721171ac8d03a7670b942e66055aace111fe.zip
chromium_src-951a721171ac8d03a7670b942e66055aace111fe.tar.gz
chromium_src-951a721171ac8d03a7670b942e66055aace111fe.tar.bz2
Switch to TimeDelta interface for TestTimeouts in dbus code.
R=keybuk@chromium.org BUG=108171 Review URL: https://chromiumcodereview.appspot.com/10735022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145714 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'dbus')
-rw-r--r--dbus/test_service.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/dbus/test_service.cc b/dbus/test_service.cc
index 986ebd6..ee1befb 100644
--- a/dbus/test_service.cc
+++ b/dbus/test_service.cc
@@ -42,9 +42,7 @@ bool TestService::StartService() {
}
bool TestService::WaitUntilServiceIsStarted() {
- const base::TimeDelta timeout(
- base::TimeDelta::FromMilliseconds(
- TestTimeouts::action_max_timeout_ms()));
+ const base::TimeDelta timeout(TestTimeouts::action_max_timeout());
// Wait until all methods are exported.
return on_all_methods_exported_.TimedWait(timeout);
}