Remove calls to deprecated MessageLoop methods on Windows and Linux.

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 <memory>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
 #include "base/process/kill.h"
 #include "base/process/launch.h"
+#include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_split.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
 
 #if !defined(OS_MACOSX)
 #include "base/at_exit.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/multiprocess_test.h"
@@ skipping 21 matching lines @@
 #define MAYBE_ForceShutdown DISABLED_ForceShutdown
 #else
 #define MAYBE_ForceShutdown ForceShutdown
 #endif
 #endif
 
 namespace {
 
 bool g_good_shutdown = false;
 
-void ShutdownTask(base::MessageLoop* loop) {
+void ShutdownTask(base::RunLoop* loop) {
   // Quit the main message loop.
   ASSERT_FALSE(g_good_shutdown);
   g_good_shutdown = true;
-  loop->task_runner()->PostTask(FROM_HERE,
-                                base::MessageLoop::QuitWhenIdleClosure());
+  loop->QuitWhenIdle();
 }
 
 }  // namespace
 
 TEST(ServiceProcessUtilTest, ScopedVersionedName) {
   std::string test_str = "test";
   std::string scoped_name = GetServiceProcessScopedVersionedName(test_str);
   EXPECT_TRUE(base::EndsWith(scoped_name, test_str,
                              base::CompareCase::SENSITIVE));
   EXPECT_NE(std::string::npos,
@@ skipping 151 matching lines @@
 }
 
 MULTIPROCESS_TEST_MAIN(ServiceProcessStateTestReadyFalse) {
   EXPECT_FALSE(CheckServiceProcessReady());
   return 0;
 }
 
 MULTIPROCESS_TEST_MAIN(ServiceProcessStateTestShutdown) {
   base::PlatformThread::SetName("ServiceProcessStateTestShutdownMainThread");
   base::MessageLoop message_loop;
+  base::RunLoop run_loop;
   base::Thread io_thread_("ServiceProcessStateTestShutdownIOThread");
   base::Thread::Options options(base::MessageLoop::TYPE_IO, 0);
   EXPECT_TRUE(io_thread_.StartWithOptions(options));
   ServiceProcessState state;
   EXPECT_TRUE(state.Initialize());
-  EXPECT_TRUE(state.SignalReady(
-      io_thread_.task_runner().get(),
-      base::Bind(&ShutdownTask, base::MessageLoop::current())));
+  EXPECT_TRUE(state.SignalReady(io_thread_.task_runner().get(),
+                                base::Bind(&ShutdownTask, &run_loop)));
   message_loop.task_runner()->PostDelayedTask(
-      FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
+      FROM_HERE, run_loop.QuitWhenIdleClosure(),
       TestTimeouts::action_max_timeout());
   EXPECT_FALSE(g_good_shutdown);
-  message_loop.Run();
+  run_loop.Run();
   EXPECT_TRUE(g_good_shutdown);
   return 0;
 }
 
 #else  // !OS_MACOSX
 
 #include <CoreFoundation/CoreFoundation.h>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 20 matching lines @@
                                          "Test",
                                          &bundle_path_,
                                          &executable_path_));
     mock_launchd_.reset(new MockLaunchd(executable_path_, &loop_,
                                         false, false));
     scoped_launchd_instance_.reset(
         new Launchd::ScopedInstance(mock_launchd_.get()));
     ASSERT_TRUE(service_process_state_.Initialize());
     ASSERT_TRUE(service_process_state_.SignalReady(
         io_thread_.task_runner().get(), base::Closure()));
-    loop_.task_runner()->PostDelayedTask(
-        FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(),
-        TestTimeouts::action_max_timeout());
+    loop_.task_runner()->PostDelayedTask(FROM_HERE,
+                                         run_loop_.QuitWhenIdleClosure(),
+                                         TestTimeouts::action_max_timeout());
   }
 
   const MockLaunchd* mock_launchd() const { return mock_launchd_.get(); }
   const base::FilePath& executable_path() const { return executable_path_; }
   const base::FilePath& bundle_path() const { return bundle_path_; }
   const base::FilePath& GetTempDirPath() const { return temp_dir_.path(); }
 
   base::SingleThreadTaskRunner* GetIOTaskRunner() {
     return io_thread_.task_runner().get();
   }
-  void Run() { loop_.Run(); }
+  void Run() { run_loop_.Run(); }
 
  private:
   base::ScopedTempDir temp_dir_;
   base::MessageLoopForUI loop_;
+  base::RunLoop run_loop_;
   base::Thread io_thread_;
   base::FilePath executable_path_, bundle_path_;
   std::unique_ptr<MockLaunchd> mock_launchd_;
   std::unique_ptr<Launchd::ScopedInstance> scoped_launchd_instance_;
   ServiceProcessState service_process_state_;
 };
 
 void DeleteFunc(const base::FilePath& file) {
   EXPECT_TRUE(base::DeleteFile(file, true));
 }
@@ skipping 101 matching lines @@
 TEST_F(ServiceProcessStateFileManipulationTest, ChangeAttr) {
   ScopedAttributesRestorer restorer(bundle_path(), 0777);
   GetIOTaskRunner()->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