chrome: Remove use of MessageLoopProxy and deprecated MessageLoop APIs

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/files/file_path.h"
+#include "base/location.h"
 #include "base/process/kill.h"
 #include "base/process/launch.h"
+#include "base/single_thread_task_runner.h"
 #include "base/strings/string_split.h"
 
 #if !defined(OS_MACOSX)
 #include "base/at_exit.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/multiprocess_test.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread.h"
@@ skipping 22 matching lines @@
 #endif
 
 namespace {
 
 bool g_good_shutdown = false;
 
 void ShutdownTask(base::MessageLoop* loop) {
   // Quit the main message loop.
   ASSERT_FALSE(g_good_shutdown);
   g_good_shutdown = true;
-  loop->PostTask(FROM_HERE, base::MessageLoop::QuitClosure());
+  loop->task_runner()->PostTask(FROM_HERE, base::MessageLoop::QuitClosure());
 }
 
 }  // namespace
 
 TEST(ServiceProcessUtilTest, ScopedVersionedName) {
   std::string test_str = "test";
   std::string scoped_name = GetServiceProcessScopedVersionedName(test_str);
   chrome::VersionInfo version_info;
   EXPECT_TRUE(EndsWith(scoped_name, test_str, true));
   EXPECT_NE(std::string::npos, scoped_name.find(version_info.Version()));
 }
 
 class ServiceProcessStateTest : public base::MultiProcessTest {
  public:
   ServiceProcessStateTest();
   ~ServiceProcessStateTest() override;
   void SetUp() override;
-  base::MessageLoopProxy* IOMessageLoopProxy() {
-    return io_thread_.message_loop_proxy().get();
+  base::SingleThreadTaskRunner* IOMessageLoopProxy() {
+    return io_thread_.task_runner().get();
   }
   void LaunchAndWait(const std::string& name);
 
  private:
   // This is used to release the ServiceProcessState singleton after each test.
   base::ShadowingAtExitManager at_exit_manager_;
   base::Thread io_thread_;
 };
 
 ServiceProcessStateTest::ServiceProcessStateTest()
@@ skipping 136 matching lines @@
 
 MULTIPROCESS_TEST_MAIN(ServiceProcessStateTestShutdown) {
   base::MessageLoop message_loop;
   message_loop.set_thread_name("ServiceProcessStateTestShutdownMainThread");
   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_.message_loop_proxy().get(),
+      io_thread_.task_runner().get(),
       base::Bind(&ShutdownTask, base::MessageLoop::current())));
-  message_loop.PostDelayedTask(FROM_HERE,
-                               base::MessageLoop::QuitClosure(),
-                               TestTimeouts::action_max_timeout());
+  message_loop.task_runner()->PostDelayedTask(
+      FROM_HERE, base::MessageLoop::QuitClosure(),
+      TestTimeouts::action_max_timeout());
   EXPECT_FALSE(g_good_shutdown);
   message_loop.Run();
   EXPECT_TRUE(g_good_shutdown);
   return 0;
 }
 
 #else  // !OS_MACOSX
 
 #include <CoreFoundation/CoreFoundation.h>
 
@@ skipping 21 matching lines @@
     ASSERT_TRUE(MockLaunchd::MakeABundle(GetTempDirPath(),
                                          "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_.message_loop_proxy().get(), base::Closure()));
+        io_thread_.task_runner().get(), base::Closure()));
     loop_.PostDelayedTask(FROM_HERE,
                           base::MessageLoop::QuitClosure(),
                           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::MessageLoopProxy* GetIOMessageLoopProxy() {
-    return io_thread_.message_loop_proxy().get();
+  base::SingleThreadTaskRunner* GetIOMessageLoopProxy() {
+    return io_thread_.task_runner().get();
   }
   void Run() { loop_.Run(); }
 
  private:
   base::ScopedTempDir temp_dir_;
   base::MessageLoopForUI loop_;
   base::Thread io_thread_;
   base::FilePath executable_path_, bundle_path_;
   scoped_ptr<MockLaunchd> mock_launchd_;
   scoped_ptr<Launchd::ScopedInstance> scoped_launchd_instance_;
@@ skipping 114 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