Remove the AudioManager singleton.

media/audio/mac/audio_low_latency_input_mac_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/environment.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_manager_base.h"
@@ skipping 66 matching lines @@
 
   virtual void OnClose(AudioInputStream* stream) {}
   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() {
-  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;
-  return audio_man->HasAudioInputDevices();
-}
+class MacAudioInputTest : public testing::Test {
+ protected:
+  MacAudioInputTest() : audio_manager_(AudioManager::Create()) {}
+  ~MacAudioInputTest() {}

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

virtual

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

Done.

 
-// Convenience method which creates a default AudioInputStream object using
-// a 10ms frame size and a sample rate which is set to the hardware sample rate.
-static AudioInputStream* CreateDefaultAudioInputStream() {
-  AudioManager* audio_man = AudioManager::GetAudioManager();
-  int fs = static_cast<int>(AUAudioInputStream::HardwareSampleRate());
-  int samples_per_packet = fs / 100;
-  AudioInputStream* ais = audio_man->MakeAudioInputStream(
-      AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
-      CHANNEL_LAYOUT_STEREO, fs, 16, samples_per_packet),
-      AudioManagerBase::kDefaultDeviceId);
-  EXPECT_TRUE(ais);
-  return ais;
-}
+  // Convenience method which ensures that we are not running on the build
+  // bots and that at least one valid input device can be found.
+  bool CanRunAudioTests() {
+    scoped_ptr<base::Environment> env(base::Environment::Create());
+    if (env->HasVar("CHROME_HEADLESS"))
+      return false;
+    return audio_manager_->HasAudioInputDevices();
+  }
 
-// Convenience method which creates an AudioInputStream object with a specified
-// channel layout.
-static AudioInputStream* CreateAudioInputStream(ChannelLayout channel_layout) {
-  AudioManager* audio_man = AudioManager::GetAudioManager();
-  int fs = static_cast<int>(AUAudioInputStream::HardwareSampleRate());
-  int samples_per_packet = fs / 100;
-  AudioInputStream* ais = audio_man->MakeAudioInputStream(
-      AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
-      channel_layout, fs, 16, samples_per_packet),
-      AudioManagerBase::kDefaultDeviceId);
-  EXPECT_TRUE(ais);
-  return ais;
-}
+  // Convenience method which creates a default AudioInputStream object using
+  // a 10ms frame size and a sample rate which is set to the hardware sample
+  // rate.
+  AudioInputStream* CreateDefaultAudioInputStream() {
+    int fs = static_cast<int>(AUAudioInputStream::HardwareSampleRate());
+    int samples_per_packet = fs / 100;
+    AudioInputStream* ais = audio_manager_->MakeAudioInputStream(
+        AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
+        CHANNEL_LAYOUT_STEREO, fs, 16, samples_per_packet),
+        AudioManagerBase::kDefaultDeviceId);
+    EXPECT_TRUE(ais);
+    return ais;
+  }
 
+  // Convenience method which creates an AudioInputStream object with a
+  // specified channel layout.
+  AudioInputStream* CreateAudioInputStream(ChannelLayout channel_layout) {
+    int fs = static_cast<int>(AUAudioInputStream::HardwareSampleRate());
+    int samples_per_packet = fs / 100;
+    AudioInputStream* ais = audio_manager_->MakeAudioInputStream(
+        AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
+        channel_layout, fs, 16, samples_per_packet),
+        AudioManagerBase::kDefaultDeviceId);
+    EXPECT_TRUE(ais);
+    return ais;
+  }
+
+  scoped_refptr<AudioManager> audio_manager_;
+};
 
 // Test Create(), Close().
-TEST(MacAudioInputTest, AUAudioInputStreamCreateAndClose) {
+TEST_F(MacAudioInputTest, AUAudioInputStreamCreateAndClose) {
   if (!CanRunAudioTests())
     return;
   AudioInputStream* ais = CreateDefaultAudioInputStream();
   ais->Close();
 }
 
 // Test Open(), Close().
-TEST(MacAudioInputTest, AUAudioInputStreamOpenAndClose) {
+TEST_F(MacAudioInputTest, AUAudioInputStreamOpenAndClose) {
   if (!CanRunAudioTests())
     return;
   AudioInputStream* ais = CreateDefaultAudioInputStream();
   EXPECT_TRUE(ais->Open());
   ais->Close();
 }
 
 // Test Open(), Start(), Close().
-TEST(MacAudioInputTest, AUAudioInputStreamOpenStartAndClose) {
+TEST_F(MacAudioInputTest, AUAudioInputStreamOpenStartAndClose) {
   if (!CanRunAudioTests())
     return;
   AudioInputStream* ais = CreateDefaultAudioInputStream();
   EXPECT_TRUE(ais->Open());
   MockAudioInputCallback sink;
   ais->Start(&sink);
   EXPECT_CALL(sink, OnClose(ais))
       .Times(1);
   ais->Close();
 }
 
 // Test Open(), Start(), Stop(), Close().
-TEST(MacAudioInputTest, AUAudioInputStreamOpenStartStopAndClose) {
+TEST_F(MacAudioInputTest, AUAudioInputStreamOpenStartStopAndClose) {
   if (!CanRunAudioTests())
     return;
   AudioInputStream* ais = CreateDefaultAudioInputStream();
   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, AUAudioInputStreamMiscCallingSequences) {
+TEST_F(MacAudioInputTest, AUAudioInputStreamMiscCallingSequences) {
   if (!CanRunAudioTests())
     return;
   AudioInputStream* ais = CreateDefaultAudioInputStream();
   AUAudioInputStream* auais = static_cast<AUAudioInputStream*>(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(auais->started());
   ais->Start(&sink);
   EXPECT_TRUE(auais->started());
 
   // Stop(), Stop() is a valid calling sequence (second call does nothing).
   ais->Stop();
   EXPECT_FALSE(auais->started());
   ais->Stop();
   EXPECT_FALSE(auais->started());
 
   EXPECT_CALL(sink, OnClose(ais))
       .Times(1);
   ais->Close();
 }
 
 // Verify that recording starts and stops correctly in mono using mocked sink.
-TEST(MacAudioInputTest, AUAudioInputStreamVerifyMonoRecording) {
+TEST_F(MacAudioInputTest, AUAudioInputStreamVerifyMonoRecording) {
   if (!CanRunAudioTests())
     return;
 
   // Create an audio input stream which records in mono.
   AudioInputStream* ais = CreateAudioInputStream(CHANNEL_LAYOUT_MONO);
   EXPECT_TRUE(ais->Open());
 
   int fs = static_cast<int>(AUAudioInputStream::HardwareSampleRate());
   int samples_per_packet = fs / 100;
   int bits_per_sample = 16;
@@ skipping 13 matching lines @@
   base::PlatformThread::Sleep(TestTimeouts::tiny_timeout_ms());
   ais->Stop();
 
   // Verify that the sink receieves OnClose() call when calling Close().
   EXPECT_CALL(sink, OnClose(ais))
       .Times(1);
   ais->Close();
 }
 
 // Verify that recording starts and stops correctly in mono using mocked sink.
-TEST(MacAudioInputTest, AUAudioInputStreamVerifyStereoRecording) {
+TEST_F(MacAudioInputTest, AUAudioInputStreamVerifyStereoRecording) {
   if (!CanRunAudioTests())
     return;
 
   // Create an audio input stream which records in stereo.
   AudioInputStream* ais = CreateAudioInputStream(CHANNEL_LAYOUT_STEREO);
   EXPECT_TRUE(ais->Open());
 
   int fs = static_cast<int>(AUAudioInputStream::HardwareSampleRate());
   int samples_per_packet = fs / 100;
   int bits_per_sample = 16;
@@ skipping 18 matching lines @@
       .Times(1);
   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(MacAudioInputTest, DISABLED_AUAudioInputStreamRecordToFile) {
+TEST_F(MacAudioInputTest, DISABLED_AUAudioInputStreamRecordToFile) {
   if (!CanRunAudioTests())
     return;
   const char* file_name = "out_stereo_10sec.pcm";
 
   int fs = static_cast<int>(AUAudioInputStream::HardwareSampleRate());
   AudioInputStream* ais = CreateDefaultAudioInputStream();
   EXPECT_TRUE(ais->Open());
 
   fprintf(stderr, "               File name  : %s\n", file_name);
   fprintf(stderr, "               Sample rate: %d\n", fs);
   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();
 }