Revert of Pass task runners to AudioManager constructor.

media/audio/audio_manager_factory_unittest.cc

Index: media/audio/audio_manager_factory_unittest.cc
diff --git a/media/audio/audio_manager_factory_unittest.cc b/media/audio/audio_manager_factory_unittest.cc
index b4ceb363059da722ef9a11274e819fb1d497f586..1d13c2e0269751ce48c34b9ad754823f0145a42f 100644
--- a/media/audio/audio_manager_factory_unittest.cc
+++ b/media/audio/audio_manager_factory_unittest.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/test/test_message_loop.h"
-#include "base/thread_task_runner_handle.h"
+#include "base/memory/scoped_ptr.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_manager_factory.h"
+#include "media/audio/fake_audio_log_factory.h"
 #include "media/audio/fake_audio_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -17,17 +17,11 @@
   FakeAudioManagerFactory() {}
   ~FakeAudioManagerFactory() override {}
 
-  ScopedAudioManagerPtr CreateInstance(
-      scoped_refptr<base::SingleThreadTaskRunner> task_runner,
-      scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
-      AudioLogFactory* audio_log_factory) override {
-    ScopedAudioManagerPtr instance(
-        new FakeAudioManager(std::move(task_runner),
-                             std::move(worker_task_runner), audio_log_factory));
+  AudioManager* CreateInstance(AudioLogFactory* audio_log_factory) override {
     // |created_instance_| is used for verifying. Ownership is transferred to
     // caller.
-    created_instance_ = instance.get();
-    return instance;
+    created_instance_ = new FakeAudioManager(audio_log_factory);
+    return created_instance_;
   }
 
   AudioManager* created_instance() { return created_instance_; }
@@ -40,29 +34,24 @@
 
 // Verifies that SetFactory has the intended effect.
 TEST(AudioManagerFactoryTest, CreateInstance) {
-  {
-    base::TestMessageLoop message_loop;
-    // Create an audio manager and verify that it is not null.
-    ScopedAudioManagerPtr manager =
-        AudioManager::CreateForTesting(base::ThreadTaskRunnerHandle::Get());
-    ASSERT_NE(nullptr, manager.get());
-  }
+  // Create an audio manager and verify that it is not null.
+  scoped_ptr<AudioManager> manager(AudioManager::CreateForTesting());
+  ASSERT_NE(nullptr, manager.get());
+  manager.reset();
 
   // Set the factory. Note that ownership of |factory| is transferred to
   // AudioManager.
   FakeAudioManagerFactory* factory = new FakeAudioManagerFactory();
   AudioManager::SetFactory(factory);
-  {
-    base::TestMessageLoop message_loop;
-    // Create the AudioManager instance. Verify that it matches the instance
-    // provided by the factory.
-    ScopedAudioManagerPtr manager =
-        AudioManager::CreateForTesting(base::ThreadTaskRunnerHandle::Get());
-    ASSERT_NE(nullptr, manager.get());
-    ASSERT_EQ(factory->created_instance(), manager.get());
-  }
+
+  // Create the AudioManager instance. Verify that it matches the instance
+  // provided by the factory.
+  manager.reset(AudioManager::CreateForTesting());
+  ASSERT_NE(nullptr, manager.get());
+  ASSERT_EQ(factory->created_instance(), manager.get());
+
   // Reset AudioManagerFactory to prevent factory from persisting to other
-  // tests on the same process.
+  // tests on the same process. |manager| will reset when scope exits.
   AudioManager::ResetFactoryForTesting();
 }