diff options
| author | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-16 02:38:51 +0000 |
|---|---|---|
| committer | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-16 02:38:51 +0000 |
| commit | 4f67d17c879cc6fac85f5baeb82115e5a5ca169f (patch) | |
| tree | 3205b017b12f171eeb6563cdec4539d7570b8bbf /dbus/test_service.cc | |
| parent | 14b95f1e35ee10b56b0ec6b88d2f563d5c14e99b (diff) | |
| download | chromium_src-4f67d17c879cc6fac85f5baeb82115e5a5ca169f.zip chromium_src-4f67d17c879cc6fac85f5baeb82115e5a5ca169f.tar.gz chromium_src-4f67d17c879cc6fac85f5baeb82115e5a5ca169f.tar.bz2 | |
Revert 117824 - Convert use of int ms to TimeDelta in files owned by brettw.
This change broke Linux and Mac bots. I would recommend to ask committers to run your next change on trybots.
(*1) http://chromegw.corp.google.com/i/chromium/builders/Mac/builds/10788/steps/compile/logs/stdio
(*2) http://chromegw.corp.google.com/i/chromium/builders/Linux/builds/19313/steps/compile/logs/stdio
(*3) http://chromegw.corp.google.com/i/chromium/builders/Linux%20x64/builds/21385/steps/compile/logs/stdio
R=brettw@chromium.org
BUG=108171
TEST=
Review URL: http://codereview.chromium.org/9185026
TBR=tedvessenes@gmail.com
Review URL: http://codereview.chromium.org/9215005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117825 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'dbus/test_service.cc')
| -rw-r--r-- | dbus/test_service.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dbus/test_service.cc b/dbus/test_service.cc index 714c09b..ea8e360 100644 --- a/dbus/test_service.cc +++ b/dbus/test_service.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -190,7 +190,7 @@ void TestService::Echo(MethodCall* method_call, void TestService::SlowEcho( MethodCall* method_call, dbus::ExportedObject::ResponseSender response_sender) { - base::PlatformThread::Sleep(TestTimeouts::tiny_timeout()); + base::PlatformThread::Sleep(TestTimeouts::tiny_timeout_ms()); Echo(method_call, response_sender); } |