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

1 files changed, 3 insertions, 3 deletions

diff --git a/chrome/common/service_process_util_unittest.cc b/chrome/common/service_process_util_unittest.cc
index c8f5677..5de195d 100644
--- a/chrome/common/service_process_util_unittest.cc
+++ b/chrome/common/service_process_util_unittest.cc
@@ -185,7 +185,7 @@ TEST_F(ServiceProcessStateTest, MAYBE_ForceShutdown) {
                                           true);
   ASSERT_TRUE(handle);
   for (int i = 0; !CheckServiceProcessReady() && i < 10; ++i) {
-    base::PlatformThread::Sleep(TestTimeouts::tiny_timeout());
+    base::PlatformThread::Sleep(TestTimeouts::tiny_timeout_ms());
   }
   ASSERT_TRUE(CheckServiceProcessReady());
   std::string version;
@@ -228,7 +228,7 @@ MULTIPROCESS_TEST_MAIN(ServiceProcessStateTestShutdown) {
                                            MessageLoop::current())));
   message_loop.PostDelayedTask(FROM_HERE,
                                MessageLoop::QuitClosure(),
-                               TestTimeouts::action_max_timeout());
+                               TestTimeouts::action_max_timeout_ms());
   EXPECT_FALSE(g_good_shutdown);
   message_loop.Run();
   EXPECT_TRUE(g_good_shutdown);
@@ -274,7 +274,7 @@ class ServiceProcessStateFileManipulationTest : public ::testing::Test {
         base::Closure()));
     loop_.PostDelayedTask(FROM_HERE,
                           MessageLoop::QuitClosure(),
-                          TestTimeouts::action_max_timeout());
+                          TestTimeouts::action_max_timeout_ms());
   }
 
   const MockLaunchd* mock_launchd() const { return mock_launchd_.get(); }