summaryrefslogtreecommitdiffstats
path: root/chrome/common/service_process_util_unittest.cc
diff options
context:
space:
mode:
authortedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-16 01:46:26 +0000
committertedvessenes@gmail.com <tedvessenes@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-16 01:46:26 +0000
commit14b95f1e35ee10b56b0ec6b88d2f563d5c14e99b (patch)
treebf18cab4afa4013ece3600c10daadaeb62428291 /chrome/common/service_process_util_unittest.cc
parent24469df740672071da7cb0a44386fff9d9cacb7f (diff)
downloadchromium_src-14b95f1e35ee10b56b0ec6b88d2f563d5c14e99b.zip
chromium_src-14b95f1e35ee10b56b0ec6b88d2f563d5c14e99b.tar.gz
chromium_src-14b95f1e35ee10b56b0ec6b88d2f563d5c14e99b.tar.bz2
Convert use of int ms to TimeDelta in files owned by brettw.
R=brettw@chromium.org BUG=108171 TEST= Review URL: http://codereview.chromium.org/9185026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117824 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/service_process_util_unittest.cc')
-rw-r--r--chrome/common/service_process_util_unittest.cc6
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 5de195d..c8f5677 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_ms());
+ base::PlatformThread::Sleep(TestTimeouts::tiny_timeout());
}
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_ms());
+ TestTimeouts::action_max_timeout());
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_ms());
+ TestTimeouts::action_max_timeout());
}
const MockLaunchd* mock_launchd() const { return mock_launchd_.get(); }