| Index: chrome/common/service_process_util_unittest.cc
|
| ===================================================================
|
| --- chrome/common/service_process_util_unittest.cc (revision 117824)
|
| +++ chrome/common/service_process_util_unittest.cc (working copy)
|
| @@ -185,7 +185,7 @@
|
| 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 @@
|
| 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 @@
|
| 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(); }
|
|
|