Replace MessageLoopProxy with SingleThreadTaskRunner for the rest of media/.

media/audio/virtual_audio_input_stream_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 <list>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "base/message_loop/message_loop.h"
 #include "base/rand_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/simple_sources.h"
 #include "media/audio/virtual_audio_input_stream.h"
 #include "media/audio/virtual_audio_output_stream.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 77 matching lines @@
 }  // namespace
 
 class VirtualAudioInputStreamTest : public testing::TestWithParam<bool> {
  public:
   VirtualAudioInputStreamTest()
       : audio_thread_(new base::Thread("AudioThread")),
         worker_thread_(new base::Thread("AudioWorkerThread")),
         stream_(NULL),
         closed_stream_(false, false) {
     audio_thread_->Start();
-    audio_message_loop_ = audio_thread_->message_loop_proxy();
+    audio_task_runner_ = audio_thread_->message_loop_proxy();
   }
 
   virtual ~VirtualAudioInputStreamTest() {
     SyncWithAudioThread();
 
     DCHECK(output_streams_.empty());
     DCHECK(stopped_output_streams_.empty());
   }
 
   void Create() {
     const bool worker_is_separate_thread = GetParam();
     stream_ = new VirtualAudioInputStream(
-        kParams, GetWorkerLoop(worker_is_separate_thread),
+        kParams, GetWorkerTaskRunner(worker_is_separate_thread),
         base::Bind(&base::DeletePointer<VirtualAudioInputStream>));
     stream_->Open();
   }
 
   void Start() {
     EXPECT_CALL(input_callback_, OnData(_, NotNull(), _, _, _))
         .Times(AtLeast(1));
 
     ASSERT_TRUE(!!stream_);
     stream_->Start(&input_callback_);
@@ skipping 69 matching lines @@
   void RestartAllStoppedOutputStreams() {
     typedef std::list<AudioOutputStream*>::const_iterator ConstIter;
     for (ConstIter it = stopped_output_streams_.begin();
          it != stopped_output_streams_.end(); ++it) {
       (*it)->Start(&source_);
       output_streams_.push_back(*it);
     }
     stopped_output_streams_.clear();
   }
 
-  const scoped_refptr<base::MessageLoopProxy>& audio_message_loop() const {
-    return audio_message_loop_;
+  const scoped_refptr<base::SingleThreadTaskRunner>& audio_task_runner() const {
+    return audio_task_runner_;
   }
 
-  const scoped_refptr<base::MessageLoopProxy>& GetWorkerLoop(
+  const scoped_refptr<base::SingleThreadTaskRunner>& GetWorkerTaskRunner(
       bool worker_is_separate_thread) {
     if (worker_is_separate_thread) {
       if (!worker_thread_->IsRunning()) {
         worker_thread_->Start();
-        worker_message_loop_ = worker_thread_->message_loop_proxy();
+        worker_task_runner_ = worker_thread_->message_loop_proxy();
       }
-      return worker_message_loop_;
+      return worker_task_runner_;
     } else {
-      return audio_message_loop_;
+      return audio_task_runner_;
     }
   }
 
  private:
   void SyncWithAudioThread() {
     base::WaitableEvent done(false, false);
-    audio_message_loop_->PostTask(
+    audio_task_runner_->PostTask(
         FROM_HERE,
         base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done)));
     done.Wait();
   }
 
   scoped_ptr<base::Thread> audio_thread_;
-  scoped_refptr<base::MessageLoopProxy> audio_message_loop_;
+  scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner_;
   scoped_ptr<base::Thread> worker_thread_;
-  scoped_refptr<base::MessageLoopProxy> worker_message_loop_;
+  scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner_;
 
   VirtualAudioInputStream* stream_;
   MockInputCallback input_callback_;
   base::WaitableEvent closed_stream_;
 
   std::list<AudioOutputStream*> output_streams_;
   std::list<AudioOutputStream*> stopped_output_streams_;
   TestAudioSource source_;
 
   DISALLOW_COPY_AND_ASSIGN(VirtualAudioInputStreamTest);
 };
 
 #define RUN_ON_AUDIO_THREAD(method)  \
-  audio_message_loop()->PostTask(  \
+  audio_task_runner()->PostTask(  \
       FROM_HERE, base::Bind(&VirtualAudioInputStreamTest::method,  \
                             base::Unretained(this)))
 
 TEST_P(VirtualAudioInputStreamTest, CreateAndClose) {
   RUN_ON_AUDIO_THREAD(Create);
   RUN_ON_AUDIO_THREAD(Close);
   WaitUntilClosed();
 }
 
 TEST_P(VirtualAudioInputStreamTest, NoOutputs) {
@@ skipping 83 matching lines @@
   }
   RUN_ON_AUDIO_THREAD(Close);
   WaitUntilClosed();
 }
 
 INSTANTIATE_TEST_CASE_P(SingleVersusMultithreaded,
                         VirtualAudioInputStreamTest,
                         ::testing::Values(false, true));
 
 }  // namespace media