Remove the AudioManager singleton.

media/audio/win/audio_low_latency_input_win_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 <windows.h>
 #include <mmsystem.h>
 
 #include "base/basictypes.h"
 #include "base/environment.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 70 matching lines @@
   virtual void OnError(AudioInputStream* stream, int code) {}
 
  private:
   media::SeekableBuffer buffer_;
   FILE* file_;
   size_t bytes_to_write_;
 };
 
 // Convenience method which ensures that we are not running on the build
 // bots and that at least one valid input device can be found.
-static bool CanRunAudioTests() {
+static bool CanRunAudioTests(AudioManager* audio_man) {
+  if (NULL == audio_man)

[scherkus (not reviewing), 2011/12/09 22:47:30]

if (!audio_man)

[tommi (sloooow) - chröme, 2011/12/10 00:11:14]

Removed check.  AudioManager:Create is always called and is basically just a
call to new().

+    return false;
+
   scoped_ptr<base::Environment> env(base::Environment::Create());
   if (env->HasVar("CHROME_HEADLESS"))
     return false;
-  AudioManager* audio_man = AudioManager::GetAudioManager();
-  if (NULL == audio_man)
-    return false;
+
   // TODO(henrika): note that we use Wave today to query the number of
   // existing input devices.
   return audio_man->HasAudioInputDevices();
 }
 
 // Convenience method which creates a default AudioInputStream object but
 // also allows the user to modify the default settings.
 class AudioInputStreamWrapper {
  public:
-  AudioInputStreamWrapper()
+  explicit AudioInputStreamWrapper(AudioManager* audio_manager)
       : com_init_(ScopedCOMInitializer::kMTA),
-        audio_man_(AudioManager::GetAudioManager()),
+        audio_man_(audio_manager),
         format_(AudioParameters::AUDIO_PCM_LOW_LATENCY),
         channel_layout_(CHANNEL_LAYOUT_STEREO),
         bits_per_sample_(16) {
     // Use native/mixing sample rate and 10ms frame size as default.
     sample_rate_ = static_cast<int>(
         WASAPIAudioInputStream::HardwareSampleRate(eConsole));
     samples_per_packet_ = sample_rate_ / 100;
   }
 
   ~AudioInputStreamWrapper() {}
@@ skipping 22 matching lines @@
   AudioInputStream* CreateInputStream() {
     AudioInputStream* ais = audio_man_->MakeAudioInputStream(
         AudioParameters(format_, channel_layout_, sample_rate_,
                         bits_per_sample_, samples_per_packet_),
                         AudioManagerBase::kDefaultDeviceId);
     EXPECT_TRUE(ais);
     return ais;
   }
 
   ScopedCOMInitializer com_init_;
-  AudioManager* audio_man_;
+  scoped_refptr<AudioManager> audio_man_;
   AudioParameters::Format format_;
   ChannelLayout channel_layout_;
   int bits_per_sample_;
   int sample_rate_;
   int samples_per_packet_;
 };
 
 // Convenience method which creates a default AudioInputStream object.
-static AudioInputStream* CreateDefaultAudioInputStream() {
-  AudioInputStreamWrapper aisw;
+static AudioInputStream* CreateDefaultAudioInputStream(
+    AudioManager* audio_manager) {
+  AudioInputStreamWrapper aisw(audio_manager);
   AudioInputStream* ais = aisw.Create();
   return ais;
 }
 
 // Verify that we can retrieve the current hardware/mixing sample rate
 // for all supported device roles. The ERole enumeration defines constants
 // that indicate the role that the system/user has assigned to an audio
 // endpoint device.
 // TODO(henrika): modify this test when we suport full device enumeration.
 TEST(WinAudioInputTest, WASAPIAudioInputStreamHardwareSampleRate) {
-  if (!CanRunAudioTests())
+  scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
+  if (!CanRunAudioTests(audio_manager.get()))

[scherkus (not reviewing), 2011/12/09 22:47:30]

.get() etc

[tommi (sloooow) - chröme, 2011/12/10 00:11:14]

Done.

     return;
 
   ScopedCOMInitializer com_init(ScopedCOMInitializer::kMTA);
 
   // Default device intended for games, system notification sounds,
   // and voice commands.
   int fs = static_cast<int>(
       WASAPIAudioInputStream::HardwareSampleRate(eConsole));
   EXPECT_GE(fs, 0);
 
   // Default communication device intended for e.g. VoIP communication.
   fs = static_cast<int>(
       WASAPIAudioInputStream::HardwareSampleRate(eCommunications));
   EXPECT_GE(fs, 0);
 
   // Multimedia device for music, movies and live music recording.
   fs = static_cast<int>(
       WASAPIAudioInputStream::HardwareSampleRate(eMultimedia));
   EXPECT_GE(fs, 0);
 }
 
 // Test Create(), Close() calling sequence.
 TEST(WinAudioInputTest, WASAPIAudioInputStreamCreateAndClose) {
-  if (!CanRunAudioTests())
+  scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
+  if (!CanRunAudioTests(audio_manager.get()))
     return;
-  AudioInputStream* ais = CreateDefaultAudioInputStream();
+  AudioInputStream* ais = CreateDefaultAudioInputStream(audio_manager.get());
   ais->Close();
 }
 
 // Test Open(), Close() calling sequence.
 TEST(WinAudioInputTest, WASAPIAudioInputStreamOpenAndClose) {
-  if (!CanRunAudioTests())
+  scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
+  if (!CanRunAudioTests(audio_manager.get()))
     return;
-  AudioInputStream* ais = CreateDefaultAudioInputStream();
+  AudioInputStream* ais = CreateDefaultAudioInputStream(audio_manager.get());
   EXPECT_TRUE(ais->Open());
   ais->Close();
 }
 
 // Test Open(), Start(), Close() calling sequence.
 TEST(WinAudioInputTest, WASAPIAudioInputStreamOpenStartAndClose) {
-  if (!CanRunAudioTests())
+  scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
+  if (!CanRunAudioTests(audio_manager.get()))
     return;
-  AudioInputStream* ais = CreateDefaultAudioInputStream();
+  AudioInputStream* ais = CreateDefaultAudioInputStream(audio_manager.get());
   EXPECT_TRUE(ais->Open());
   MockAudioInputCallback sink;
   ais->Start(&sink);
   EXPECT_CALL(sink, OnClose(ais))
       .Times(1);
   ais->Close();
 }
 
 // Test Open(), Start(), Stop(), Close() calling sequence.
 TEST(WinAudioInputTest, WASAPIAudioInputStreamOpenStartStopAndClose) {
-  if (!CanRunAudioTests())
+  scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
+  if (!CanRunAudioTests(audio_manager.get()))
     return;
-  AudioInputStream* ais = CreateDefaultAudioInputStream();
+  AudioInputStream* ais = CreateDefaultAudioInputStream(audio_manager.get());
   EXPECT_TRUE(ais->Open());
   MockAudioInputCallback sink;
   ais->Start(&sink);
   ais->Stop();
   EXPECT_CALL(sink, OnClose(ais))
       .Times(1);
   ais->Close();
 }
 
 // Test some additional calling sequences.
 TEST(MacAudioInputTest, WASAPIAudioInputStreamMiscCallingSequences) {
-  if (!CanRunAudioTests())
+  scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
+  if (!CanRunAudioTests(audio_manager.get()))
     return;
-  AudioInputStream* ais = CreateDefaultAudioInputStream();
+  AudioInputStream* ais = CreateDefaultAudioInputStream(audio_manager.get());
   WASAPIAudioInputStream* wais = static_cast<WASAPIAudioInputStream*>(ais);
 
   // Open(), Open() should fail the second time.
   EXPECT_TRUE(ais->Open());
   EXPECT_FALSE(ais->Open());
 
   MockAudioInputCallback sink;
 
   // Start(), Start() is a valid calling sequence (second call does nothing).
   ais->Start(&sink);
   EXPECT_TRUE(wais->started());
   ais->Start(&sink);
   EXPECT_TRUE(wais->started());
 
   // Stop(), Stop() is a valid calling sequence (second call does nothing).
   ais->Stop();
   EXPECT_FALSE(wais->started());
   ais->Stop();
   EXPECT_FALSE(wais->started());
 
   EXPECT_CALL(sink, OnClose(ais))
     .Times(1);
   ais->Close();
 }
 
 TEST(WinAudioInputTest, WASAPIAudioInputStreamTestPacketSizes) {
-  if (!CanRunAudioTests())
+  scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
+  if (!CanRunAudioTests(audio_manager.get()))
     return;
 
   // 10 ms packet size.
 
   // Create default WASAPI input stream which records in stereo using
   // the shared mixing rate. The default buffer size is 10ms.
-  AudioInputStreamWrapper aisw;
+  AudioInputStreamWrapper aisw(audio_manager.get());
   AudioInputStream* ais = aisw.Create();
   EXPECT_TRUE(ais->Open());
 
   MockAudioInputCallback sink;
 
   // Derive the expected size in bytes of each recorded packet.
   uint32 bytes_per_packet = aisw.channels() * aisw.samples_per_packet() *
       (aisw.bits_per_sample() / 8);
 
   // We use 10ms packets and will run the test for ~100ms. Given that the
@@ skipping 52 matching lines @@
   ais->Close();
 }
 
 // This test is intended for manual tests and should only be enabled
 // when it is required to store the captured data on a local file.
 // By default, GTest will print out YOU HAVE 1 DISABLED TEST.
 // To include disabled tests in test execution, just invoke the test program
 // with --gtest_also_run_disabled_tests or set the GTEST_ALSO_RUN_DISABLED_TESTS
 // environment variable to a value greater than 0.
 TEST(WinAudioInputTest, DISABLED_WASAPIAudioInputStreamRecordToFile) {
-  if (!CanRunAudioTests())
+  scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
+  if (!CanRunAudioTests(audio_manager.get()))
     return;
 
   const char* file_name = "out_stereo_10sec.pcm";
 
-  AudioInputStreamWrapper aisw;
+  AudioInputStreamWrapper aisw(audio_manager.get());
   AudioInputStream* ais = aisw.Create();
   EXPECT_TRUE(ais->Open());
 
   fprintf(stderr, "               File name  : %s\n", file_name);
   fprintf(stderr, "               Sample rate: %d\n", aisw.sample_rate());
   WriteToFileAudioSink file_sink(file_name);
   fprintf(stderr, "               >> Speak into the mic while recording...\n");
   ais->Start(&file_sink);
   base::PlatformThread::Sleep(TestTimeouts::action_timeout_ms());
   ais->Stop();
   fprintf(stderr, "               >> Recording has stopped.\n");
   ais->Close();
 }