Reland: Pass task runners to AudioManager constructor.

media/audio/mac/audio_auhal_mac_unittest.cc

 // Copyright 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/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 "media/audio/audio_io.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_unittest_util.h"
 #include "media/audio/mock_audio_source_callback.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::_;
 using testing::DoAll;
 using testing::Return;
 
 // TODO(crogers): Most of these tests can be made platform agnostic.
 // http://crbug.com/223242
 
 namespace media {
 
 ACTION(ZeroBuffer) {
   arg0->Zero();
 }
 
 ACTION_P(SignalEvent, event) {
   event->Signal();
 }
 
 class AUHALStreamTest : public testing::Test {
  public:
   AUHALStreamTest()
       : message_loop_(base::MessageLoop::TYPE_UI),
-        manager_(AudioManager::CreateForTesting()) {
+        manager_(AudioManager::CreateForTesting(
+            base::ThreadTaskRunnerHandle::Get())) {
     // Wait for the AudioManager to finish any initialization on the audio loop.
     base::RunLoop().RunUntilIdle();
   }
 
-  ~AUHALStreamTest() override { base::RunLoop().RunUntilIdle(); }
+  ~AUHALStreamTest() override {}
 
   AudioOutputStream* Create() {
     return manager_->MakeAudioOutputStream(
         manager_->GetDefaultOutputStreamParameters(), "");
   }
 
   bool OutputDevicesAvailable() {
     return manager_->HasAudioOutputDevices();
   }
 
  protected:
-  base::MessageLoop message_loop_;
-  scoped_ptr<AudioManager> manager_;
+  base::TestMessageLoop message_loop_;
+  ScopedAudioManagerPtr manager_;
   MockAudioSourceCallback source_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AUHALStreamTest);
 };
 
 TEST_F(AUHALStreamTest, HardwareSampleRate) {
   ABORT_AUDIO_TEST_IF_NOT(OutputDevicesAvailable());
   const AudioParameters preferred_params =
       manager_->GetDefaultOutputStreamParameters();
@@ skipping 25 matching lines @@
       .WillOnce(DoAll(ZeroBuffer(), SignalEvent(&event), Return(0)));
   EXPECT_CALL(source_, OnError(_)).Times(0);
   stream->Start(&source_);
   event.Wait();
 
   stream->Stop();
   stream->Close();
 }
 
 }  // namespace media