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 1d13c2e0269751ce48c34b9ad754823f0145a42f..0fa402b19eb2a3c10615107006ac0c7623eba196 100644
--- a/media/audio/audio_manager_factory_unittest.cc
+++ b/media/audio/audio_manager_factory_unittest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/memory/scoped_ptr.h"
+#include "base/message_loop/message_loop.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_manager_factory.h"
 #include "media/audio/fake_audio_log_factory.h"
@@ -17,11 +18,16 @@ class FakeAudioManagerFactory : public AudioManagerFactory {
   FakeAudioManagerFactory() {}
   ~FakeAudioManagerFactory() override {}
 
-  AudioManager* CreateInstance(AudioLogFactory* audio_log_factory) 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(
+        task_runner, worker_task_runner, audio_log_factory));
     // |created_instance_| is used for verifying. Ownership is transferred to
     // caller.
-    created_instance_ = new FakeAudioManager(audio_log_factory);
-    return created_instance_;
+    created_instance_ = instance.get();
+    return instance;
   }
 
   AudioManager* created_instance() { return created_instance_; }
@@ -34,8 +40,12 @@ class FakeAudioManagerFactory : public AudioManagerFactory {
 
 // Verifies that SetFactory has the intended effect.
 TEST(AudioManagerFactoryTest, CreateInstance) {
+  FakeAudioLogFactory fake_audio_log_factory;
+  base::MessageLoop message_loop;
   // Create an audio manager and verify that it is not null.
-  scoped_ptr<AudioManager> manager(AudioManager::CreateForTesting());
+  ScopedAudioManagerPtr manager(AudioManager::Create(
+      message_loop.task_runner(), message_loop.task_runner(), nullptr,
+      &fake_audio_log_factory));
   ASSERT_NE(nullptr, manager.get());
   manager.reset();
 
@@ -46,12 +56,14 @@ TEST(AudioManagerFactoryTest, CreateInstance) {
 
   // Create the AudioManager instance. Verify that it matches the instance
   // provided by the factory.
-  manager.reset(AudioManager::CreateForTesting());
+  manager = AudioManager::Create(message_loop.task_runner(),
+                                 message_loop.task_runner(), nullptr,
+                                 &fake_audio_log_factory);
   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. |manager| will reset when scope exits.
+  // tests on the same process.
   AudioManager::ResetFactoryForTesting();
 }