Revert 117824 - Convert use of int ms to TimeDelta in files owned by brettw.

chrome/common/service_process_util_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/common/service_process_util.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 167 matching lines @@
   ASSERT_TRUE(state.Initialize());
   ASSERT_TRUE(GetServiceProcessData(&version, &pid));
   ASSERT_EQ(base::GetCurrentProcId(), pid);
 }
 
 TEST_F(ServiceProcessStateTest, MAYBE_ForceShutdown) {
   base::ProcessHandle handle = SpawnChild("ServiceProcessStateTestShutdown",
                                           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;
   base::ProcessId pid;
   ASSERT_TRUE(GetServiceProcessData(&version, &pid));
   ASSERT_TRUE(ForceServiceProcessShutdown(version, pid));
   int exit_code = 0;
   ASSERT_TRUE(base::WaitForExitCodeWithTimeout(handle,
       &exit_code, TestTimeouts::action_max_timeout_ms()));
   base::CloseProcessHandle(handle);
@@ skipping 22 matching lines @@
   base::Thread io_thread_("ServiceProcessStateTestShutdownIOThread");
   base::Thread::Options options(MessageLoop::TYPE_IO, 0);
   EXPECT_TRUE(io_thread_.StartWithOptions(options));
   ServiceProcessState state;
   EXPECT_TRUE(state.Initialize());
   EXPECT_TRUE(state.SignalReady(io_thread_.message_loop_proxy(),
                                 base::Bind(&ShutdownTask,
                                            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);
   return 0;
 }
 
 #else  // !OS_MACOSX
 
 #include <CoreFoundation/CoreFoundation.h>
 
@@ skipping 25 matching lines @@
                                          &executable_path_));
     mock_launchd_.reset(new MockLaunchd(executable_path_, &loop_));
     scoped_launchd_instance_.reset(
         new Launchd::ScopedInstance(mock_launchd_.get()));
     ASSERT_TRUE(service_process_state_.Initialize());
     ASSERT_TRUE(service_process_state_.SignalReady(
         io_thread_.message_loop_proxy(),
         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(); }
   const FilePath& executable_path() const { return executable_path_; }
   const FilePath& bundle_path() const { return bundle_path_; }
   const FilePath& GetTempDirPath() const { return temp_dir_.path(); }
 
   base::MessageLoopProxy* GetIOMessageLoopProxy() {
     return io_thread_.message_loop_proxy().get();
   }
@@ skipping 120 matching lines @@
   ScopedAttributesRestorer restorer(bundle_path(), 0777);
   GetIOMessageLoopProxy()->PostTask(
       FROM_HERE,
       base::Bind(&ChangeAttr, bundle_path(), 0222));
   Run();
   ASSERT_TRUE(mock_launchd()->remove_called());
   ASSERT_TRUE(mock_launchd()->delete_called());
 }
 
 #endif  // !OS_MACOSX