Revert of Pass task runners to AudioManager constructor.

media/audio/sounds/audio_stream_handler_unittest.cc

Index: media/audio/sounds/audio_stream_handler_unittest.cc
diff --git a/media/audio/sounds/audio_stream_handler_unittest.cc b/media/audio/sounds/audio_stream_handler_unittest.cc
index 4863bc921a8defd0f73681c9e47118e02f83f448..1b87ca424ac48794c6c59b5fbfa96d6def94d5d7 100644
--- a/media/audio/sounds/audio_stream_handler_unittest.cc
+++ b/media/audio/sounds/audio_stream_handler_unittest.cc
@@ -7,9 +7,8 @@
 #include "base/compiler_specific.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/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/simple_sources.h"
@@ -26,9 +25,7 @@
   ~AudioStreamHandlerTest() override {}
 
   void SetUp() override {
-    audio_manager_ =
-        AudioManager::CreateForTesting(base::ThreadTaskRunnerHandle::Get());
-    base::RunLoop().RunUntilIdle();
+    audio_manager_.reset(AudioManager::CreateForTesting());
 
     base::StringPiece data(kTestAudioData, arraysize(kTestAudioData));
     audio_stream_handler_.reset(new AudioStreamHandler(data));
@@ -36,7 +33,7 @@
 
   void TearDown() override {
     audio_stream_handler_.reset();
-    base::RunLoop().RunUntilIdle();
+    audio_manager_.reset();
   }
 
   AudioStreamHandler* audio_stream_handler() {
@@ -53,9 +50,10 @@
   }
 
  private:
-  base::TestMessageLoop message_loop_;
-  ScopedAudioManagerPtr audio_manager_;
+  scoped_ptr<AudioManager> audio_manager_;
   scoped_ptr<AudioStreamHandler> audio_stream_handler_;
+
+  base::MessageLoop message_loop_;
 };
 
 TEST_F(AudioStreamHandlerTest, Play) {