Remove the AudioManager singleton.

media/audio/audio_input_controller_unittest.cc

 // Copyright (c) 2011 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/basictypes.h"
 #include "base/synchronization/waitable_event.h"
 #include "media/audio/audio_input_controller.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 33 matching lines @@
 };
 
 // Test AudioInputController for create and close without recording audio.
 TEST(AudioInputControllerTest, CreateAndClose) {
   MockAudioInputControllerEventHandler event_handler;
   base::WaitableEvent event(false, false);
   // If OnCreated is called then signal the event.
   EXPECT_CALL(event_handler, OnCreated(NotNull()))
       .WillOnce(InvokeWithoutArgs(&event, &base::WaitableEvent::Signal));
 
+  scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
   AudioParameters params(AudioParameters::AUDIO_MOCK, kChannelLayout,
                          kSampleRate, kBitsPerSample, kSamplesPerPacket);
   scoped_refptr<AudioInputController> controller =
-      AudioInputController::Create(&event_handler, params);
+      AudioInputController::Create(audio_manager, &event_handler, params);
   ASSERT_TRUE(controller.get());
 
   // Wait for OnCreated() to be called.
   event.Wait();
 
   controller->Close();
 }
 
 // Test a normal call sequence of create, record and close.
 TEST(AudioInputControllerTest, RecordAndClose) {
   MockAudioInputControllerEventHandler event_handler;
   base::WaitableEvent event(false, false);
   int count = 0;
 
   // If OnCreated is called then signal the event.
   EXPECT_CALL(event_handler, OnCreated(NotNull()))
       .WillOnce(InvokeWithoutArgs(&event, &base::WaitableEvent::Signal));
 
   // OnRecording() will be called only once.
   EXPECT_CALL(event_handler, OnRecording(NotNull()))
       .Times(Exactly(1));
 
   // If OnData is called enough then signal the event.
   EXPECT_CALL(event_handler, OnData(NotNull(), NotNull(), _))
       .Times(AtLeast(10))
       .WillRepeatedly(CheckCountAndSignalEvent(&count, 10, &event));
 
+  scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
   AudioParameters params(AudioParameters::AUDIO_MOCK, kChannelLayout,
                          kSampleRate, kBitsPerSample, kSamplesPerPacket);
   scoped_refptr<AudioInputController> controller =
-      AudioInputController::Create(&event_handler, params);
+      AudioInputController::Create(audio_manager, &event_handler, params);
   ASSERT_TRUE(controller.get());
 
   // Wait for OnCreated() to be called.
   event.Wait();
   event.Reset();
 
   // Record and then wait for the event to be signaled.
   controller->Record();
   event.Wait();
 
@@ skipping 17 matching lines @@
 
   // If OnData is called enough then signal the event.
   EXPECT_CALL(event_handler, OnData(NotNull(), NotNull(), _))
       .Times(AtLeast(10))
       .WillRepeatedly(CheckCountAndSignalEvent(&count, 10, &event));
 
   // OnError will be called after the data stream stops.
   EXPECT_CALL(event_handler, OnError(NotNull(), 0))
       .WillOnce(InvokeWithoutArgs(&event, &base::WaitableEvent::Signal));
 
+  scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
   AudioParameters params(AudioParameters::AUDIO_MOCK, kChannelLayout,
                          kSampleRate, kBitsPerSample, kSamplesPerPacket);
   scoped_refptr<AudioInputController> controller =
-      AudioInputController::Create(&event_handler, params);
+      AudioInputController::Create(audio_manager, &event_handler, params);
   ASSERT_TRUE(controller.get());
 
   // Wait for OnCreated() to be called.
   event.Wait();
   event.Reset();
 
   // Record and then wait for the event to be signaled.
   controller->Record();
   event.Wait();
   event.Reset();
 
   // Wait for the stream to be stopped.
   AudioInputStream* stream = controller->stream_for_testing();
   stream->Stop();
   event.Wait();
 
   controller->Close();
 }
 
 // Test that AudioInputController rejects insanely large packet sizes.
 TEST(AudioInputControllerTest, SamplesPerPacketTooLarge) {
   // Create an audio device with a very large packet size.
   MockAudioInputControllerEventHandler event_handler;
 
+  scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
   AudioParameters params(AudioParameters::AUDIO_MOCK, kChannelLayout,
                          kSampleRate, kBitsPerSample, kSamplesPerPacket * 1000);
   scoped_refptr<AudioInputController> controller = AudioInputController::Create(
-      &event_handler, params);
+      audio_manager, &event_handler, params);
   ASSERT_FALSE(controller);
 }
 
 // Test calling AudioInputController::Close multiple times.
 TEST(AudioInputControllerTest, CloseTwice) {
   MockAudioInputControllerEventHandler event_handler;
   EXPECT_CALL(event_handler, OnCreated(NotNull()));
+  scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
   AudioParameters params(AudioParameters::AUDIO_MOCK, kChannelLayout,
                          kSampleRate, kBitsPerSample, kSamplesPerPacket);
   scoped_refptr<AudioInputController> controller =
-      AudioInputController::Create(&event_handler, params);
+      AudioInputController::Create(audio_manager, &event_handler, params);
   ASSERT_TRUE(controller.get());
 
   controller->Close();
   controller->Close();
 }
 
 }  // namespace media