base: Remove most uses of MessageLoopProxy

base/deferred_sequenced_task_runner_unittest.cc

 // Copyright (c) 2013 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 "base/deferred_sequenced_task_runner.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/location.h"
 #include "base/memory/ref_counted.h"
-#include "base/message_loop/message_loop.h"
-#include "base/message_loop/message_loop_proxy.h"
+#include "base/single_thread_task_runner.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/threading/thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 class DeferredSequencedTaskRunnerTest : public testing::Test,
                                         public base::NonThreadSafe {
  public:
@@ skipping 28 matching lines @@
   }
 
   void StartRunner() {
     runner_->Start();
   }
 
   void DoNothing(ExecuteTaskOnDestructor* object) {
   }
 
  protected:
-  DeferredSequencedTaskRunnerTest() :
-      loop_(),
-      runner_(
-          new base::DeferredSequencedTaskRunner(loop_.message_loop_proxy())) {
-  }
+  DeferredSequencedTaskRunnerTest()
+      : loop_(),
+        runner_(new base::DeferredSequencedTaskRunner(loop_.task_runner())) {}
 
   base::MessageLoop loop_;
   scoped_refptr<base::DeferredSequencedTaskRunner> runner_;
   mutable base::Lock lock_;
   std::vector<int> executed_task_ids_;
 };
 
 TEST_F(DeferredSequencedTaskRunnerTest, Stopped) {
   PostExecuteTask(1);
   loop_.RunUntilIdle();
@@ skipping 43 matching lines @@
   EXPECT_THAT(executed_task_ids_, testing::ElementsAre(1, 2, 3, 4, 5, 6, 7, 8));
 }
 
 TEST_F(DeferredSequencedTaskRunnerTest, DeferredStartWithMultipleThreads) {
   {
     base::Thread thread1("DeferredSequencedTaskRunnerTestThread1");
     base::Thread thread2("DeferredSequencedTaskRunnerTestThread2");
     thread1.Start();
     thread2.Start();
     for (int i = 0; i < 5; ++i) {
-      thread1.message_loop()->PostTask(
+      thread1.task_runner()->PostTask(
           FROM_HERE,
           base::Bind(&DeferredSequencedTaskRunnerTest::PostExecuteTask,
-                     base::Unretained(this),
-                     2 * i));
-      thread2.message_loop()->PostTask(
+                     base::Unretained(this), 2 * i));
+      thread2.task_runner()->PostTask(
           FROM_HERE,
           base::Bind(&DeferredSequencedTaskRunnerTest::PostExecuteTask,
-                     base::Unretained(this),
-                     2 * i + 1));
+                     base::Unretained(this), 2 * i + 1));
       if (i == 2) {
-        thread1.message_loop()->PostTask(
-            FROM_HERE,
-            base::Bind(&DeferredSequencedTaskRunnerTest::StartRunner,
-                       base::Unretained(this)));
+        thread1.task_runner()->PostTask(
+            FROM_HERE, base::Bind(&DeferredSequencedTaskRunnerTest::StartRunner,
+                                  base::Unretained(this)));
       }
     }
   }
 
   loop_.RunUntilIdle();
   EXPECT_THAT(executed_task_ids_,
       testing::WhenSorted(testing::ElementsAre(0, 1, 2, 3, 4, 5, 6, 7, 8, 9)));
 }
 
 TEST_F(DeferredSequencedTaskRunnerTest, ObjectDestructionOrder) {
   {
     base::Thread thread("DeferredSequencedTaskRunnerTestThread");
     thread.Start();
-    runner_ =
-        new base::DeferredSequencedTaskRunner(thread.message_loop_proxy());
+    runner_ = new base::DeferredSequencedTaskRunner(thread.task_runner());
     for (int i = 0; i < 5; ++i) {
       {
         // Use a block to ensure that no reference to |short_lived_object|
         // is kept on the main thread after it is posted to |runner_|.
         scoped_refptr<ExecuteTaskOnDestructor> short_lived_object =
             new ExecuteTaskOnDestructor(this, 2 * i);
         runner_->PostTask(
             FROM_HERE,
             base::Bind(&DeferredSequencedTaskRunnerTest::DoNothing,
                        base::Unretained(this),
                        short_lived_object));
       }
       // |short_lived_object| with id |2 * i| should be destroyed before the
       // task |2 * i + 1| is executed.
       PostExecuteTask(2 * i + 1);
     }
     StartRunner();
   }
 
   // All |short_lived_object| with id |2 * i| are destroyed before the task
   // |2 * i + 1| is executed.
   EXPECT_THAT(executed_task_ids_,
               testing::ElementsAre(0, 1, 2, 3, 4, 5, 6, 7, 8, 9));
 }
 
 }  // namespace