Reland: Pass task runners to AudioManager constructor.

media/audio/sounds/sounds_manager_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 <vector>
 
 #include "base/compiler_specific.h"
 #include "base/logging.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/strings/string_piece.h"
+#include "base/test/test_message_loop.h"
+#include "base/thread_task_runner_handle.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/simple_sources.h"
 #include "media/audio/sounds/audio_stream_handler.h"
 #include "media/audio/sounds/sounds_manager.h"
 #include "media/audio/sounds/test_data.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
 class SoundsManagerTest : public testing::Test {
  public:
   SoundsManagerTest() {}
   ~SoundsManagerTest() override {}
 
   void SetUp() override {
-    audio_manager_.reset(AudioManager::CreateForTesting());
+    audio_manager_ =
+        AudioManager::CreateForTesting(base::ThreadTaskRunnerHandle::Get());
     SoundsManager::Create();
+    base::RunLoop().RunUntilIdle();
   }
 
   void TearDown() override {
     SoundsManager::Shutdown();
-    audio_manager_.reset();
+    base::RunLoop().RunUntilIdle();
   }
 
   void SetObserverForTesting(AudioStreamHandler::TestObserver* observer) {
     AudioStreamHandler::SetObserverForTesting(observer);
   }
 
   void SetAudioSourceForTesting(
       AudioOutputStream::AudioSourceCallback* source) {
     AudioStreamHandler::SetAudioSourceForTesting(source);
   }
 
  private:
-  scoped_ptr<AudioManager> audio_manager_;
-
-  base::MessageLoop message_loop_;
+  base::TestMessageLoop message_loop_;
+  ScopedAudioManagerPtr audio_manager_;
 };
 
 TEST_F(SoundsManagerTest, Play) {
   ASSERT_TRUE(SoundsManager::Get());
 
   base::RunLoop run_loop;
   TestObserver observer(run_loop.QuitClosure());
 
   SetObserverForTesting(&observer);
 
@@ skipping 45 matching lines @@
   SetObserverForTesting(NULL);
 }
 
 TEST_F(SoundsManagerTest, Uninitialized) {
   ASSERT_TRUE(SoundsManager::Get());
   ASSERT_FALSE(SoundsManager::Get()->Play(kTestAudioKey));
   ASSERT_FALSE(SoundsManager::Get()->Stop(kTestAudioKey));
 }
 
 }  // namespace media