Reland: Pass task runners to AudioManager constructor.

media/audio/audio_input_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 <stdint.h>
 
 #include "base/bind.h"
 #include "base/environment.h"
 #include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "base/synchronization/waitable_event.h"
+#include "base/test/test_message_loop.h"
+#include "base/thread_task_runner_handle.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/audio/audio_unittest_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
 // This class allows to find out if the callbacks are occurring as
@@ skipping 19 matching lines @@
   int had_error() const {
     return had_error_;
   }
 
  private:
   int callback_count_;
   int had_error_;
 };
 
 class AudioInputTest : public testing::Test {
-  public:
-   AudioInputTest() :
-      message_loop_(base::MessageLoop::TYPE_UI),
-      audio_manager_(AudioManager::CreateForTesting()),
-      audio_input_stream_(NULL) {
-    // Wait for the AudioManager to finish any initialization on the audio loop.
+ public:
+  AudioInputTest()
+      : message_loop_(base::MessageLoop::TYPE_UI),
+        audio_manager_(AudioManager::CreateForTesting(
+            base::ThreadTaskRunnerHandle::Get())),
+        audio_input_stream_(NULL) {
     base::RunLoop().RunUntilIdle();
   }
 
-  ~AudioInputTest() override { base::RunLoop().RunUntilIdle(); }
+  ~AudioInputTest() override {}
 
  protected:
   bool InputDevicesAvailable() {
     return audio_manager_->HasAudioInputDevices();
   }
 
   void MakeAudioInputStreamOnAudioThread() {
     RunOnAudioThread(
         base::Bind(&AudioInputTest::MakeAudioInputStream,
                    base::Unretained(this)));
@@ skipping 64 matching lines @@
 
   void StopAndClose() {
     DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
     audio_input_stream_->Stop();
     audio_input_stream_->Close();
     audio_input_stream_ = NULL;
   }
 
   // Synchronously runs the provided callback/closure on the audio thread.
   void RunOnAudioThread(const base::Closure& closure) {
-    if (!audio_manager_->GetTaskRunner()->BelongsToCurrentThread()) {
-      base::WaitableEvent event(false, false);
-      audio_manager_->GetTaskRunner()->PostTask(
-          FROM_HERE,
-          base::Bind(&AudioInputTest::RunOnAudioThreadImpl,
-                     base::Unretained(this),
-                     closure,
-                     &event));
-      event.Wait();
-    } else {
-      closure.Run();
-    }
+    DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
+    closure.Run();
   }
 
-  void RunOnAudioThreadImpl(const base::Closure& closure,
-                            base::WaitableEvent* event) {
-    DCHECK(audio_manager_->GetTaskRunner()->BelongsToCurrentThread());
-    closure.Run();
-    event->Signal();
-  }
-
-  base::MessageLoop message_loop_;
-  scoped_ptr<AudioManager> audio_manager_;
+  base::TestMessageLoop message_loop_;
+  ScopedAudioManagerPtr audio_manager_;
   AudioInputStream* audio_input_stream_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AudioInputTest);
 };
 
 // Test create and close of an AudioInputStream without recording audio.
 TEST_F(AudioInputTest, CreateAndClose) {
   ABORT_AUDIO_TEST_IF_NOT(InputDevicesAvailable());
   MakeAudioInputStreamOnAudioThread();
@@ skipping 35 matching lines @@
 // Test a normal recording sequence using an AudioInputStream.
 // Very simple test which starts capturing during half a second and verifies
 // that recording starts.
 TEST_F(AudioInputTest, MAYBE_Record) {
   ABORT_AUDIO_TEST_IF_NOT(InputDevicesAvailable());
   MakeAudioInputStreamOnAudioThread();
 
   TestInputCallback test_callback;
   OpenAndStartAudioInputStreamOnAudioThread(&test_callback);
 
-  message_loop_.PostDelayedTask(FROM_HERE,
-                                base::MessageLoop::QuitWhenIdleClosure(),
-                                base::TimeDelta::FromMilliseconds(500));
-  message_loop_.Run();
+  base::RunLoop run_loop;
+  base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
+      FROM_HERE, run_loop.QuitClosure(),
+      base::TimeDelta::FromMilliseconds(500));
+  run_loop.Run();
   EXPECT_GE(test_callback.callback_count(), 2);
   EXPECT_FALSE(test_callback.had_error());
 
   StopAndCloseAudioInputStreamOnAudioThread();
 }
 
 }  // namespace media