Moved AudioUtil static functions to AudioManager interfaces

content/renderer/media/webrtc_audio_device_unittest.cc

 // Copyright (c) 2012 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/environment.h"
 #include "base/test/test_timeouts.h"
 #include "content/renderer/media/webrtc_audio_capturer.h"
 #include "content/renderer/media/webrtc_audio_device_impl.h"
 #include "content/renderer/media/webrtc_audio_renderer.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/test/webrtc_audio_device_test.h"
 #include "media/audio/audio_manager_base.h"
-#include "media/audio/audio_util.h"
 #include "media/base/audio_hardware_config.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "third_party/webrtc/voice_engine/include/voe_audio_processing.h"
 #include "third_party/webrtc/voice_engine/include/voe_base.h"
 #include "third_party/webrtc/voice_engine/include/voe_external_media.h"
 #include "third_party/webrtc/voice_engine/include/voe_file.h"
 #include "third_party/webrtc/voice_engine/include/voe_network.h"
 
 using testing::_;
 using testing::AnyNumber;
 using testing::InvokeWithoutArgs;
 using testing::Return;
 using testing::StrEq;
 
 namespace content {
 
 namespace {
 
 const int kRenderViewId = 1;
 
-scoped_ptr<media::AudioHardwareConfig> CreateRealHardwareConfig() {
+scoped_ptr<media::AudioHardwareConfig> CreateRealHardwareConfig(
+    media::AudioManager* manager) {
+  const media::AudioParameters output_parameters =
+      manager->GetDefaultOutputStreamParameters();
+  const media::AudioParameters input_parameters =
+      manager->GetDefaultInputStreamParameters(
+          media::AudioManagerBase::kDefaultDeviceId);
   return make_scoped_ptr(new media::AudioHardwareConfig(
-      media::GetAudioHardwareBufferSize(), media::GetAudioHardwareSampleRate(),
-      media::GetAudioInputHardwareSampleRate(
-          media::AudioManagerBase::kDefaultDeviceId),
-      media::GetAudioInputHardwareChannelLayout(
-          media::AudioManagerBase::kDefaultDeviceId)));
+      output_parameters.frames_per_buffer(), output_parameters.sample_rate(),
+      input_parameters.sample_rate(), input_parameters.channel_layout() ));
 }
 
 // Return true if at least one element in the array matches |value|.
 bool FindElementInArray(const int* array, int size, int value) {
   return (std::find(&array[0], &array[0] + size, value) != &array[size]);
 }
 
 // This method returns false if a non-supported rate is detected on the
 // input or output side.
 // TODO(henrika): add support for automatic fallback to Windows Wave audio
@@ skipping 192 matching lines @@
 // webrtc::VoEExternalMedia implementation to hijack the output audio and
 // verify that streaming starts correctly.
 // Disabled when running headless since the bots don't have the required config.
 // Flaky, http://crbug.com/167299 .
 TEST_F(WebRTCAudioDeviceTest, DISABLED_StartPlayout) {
   if (!has_output_devices_) {
     LOG(WARNING) << "No output device detected.";
     return;
   }
 
-  scoped_ptr<media::AudioHardwareConfig> config = CreateRealHardwareConfig();
+  scoped_ptr<media::AudioHardwareConfig> config =
+      CreateRealHardwareConfig(audio_manager_.get());
   SetAudioHardwareConfig(config.get());
 
   if (!HardwareSampleRatesAreValid())
     return;
 
   EXPECT_CALL(media_observer(),
       OnSetAudioStreamStatus(_, 1, StrEq("created"))).Times(1);
   EXPECT_CALL(media_observer(),
       OnSetAudioStreamPlaying(_, 1, true)).Times(1);
   EXPECT_CALL(media_observer(),
@@ skipping 65 matching lines @@
 #define MAYBE_StartRecording DISABLED_StartRecording
 #else
 #define MAYBE_StartRecording StartRecording
 #endif
 TEST_F(WebRTCAudioDeviceTest, MAYBE_StartRecording) {
   if (!has_input_devices_ || !has_output_devices_) {
     LOG(WARNING) << "Missing audio devices.";
     return;
   }
 
-  scoped_ptr<media::AudioHardwareConfig> config = CreateRealHardwareConfig();
+  scoped_ptr<media::AudioHardwareConfig> config =
+      CreateRealHardwareConfig(audio_manager_.get());
   SetAudioHardwareConfig(config.get());
 
   if (!HardwareSampleRatesAreValid())
     return;
 
   // TODO(tommi): extend MediaObserver and MockMediaObserver with support
   // for new interfaces, like OnSetAudioStreamRecording(). When done, add
   // EXPECT_CALL() macros here.
   scoped_refptr<WebRtcAudioDeviceImpl> webrtc_audio_device(
       new WebRtcAudioDeviceImpl());
@@ skipping 52 matching lines @@
 // Flaky, http://crbug.com/167298 .
 TEST_F(WebRTCAudioDeviceTest, DISABLED_PlayLocalFile) {
   if (!has_output_devices_) {
     LOG(WARNING) << "No output device detected.";
     return;
   }
 
   std::string file_path(
       GetTestDataPath(FILE_PATH_LITERAL("speechmusic_mono_16kHz.pcm")));
 
-  scoped_ptr<media::AudioHardwareConfig> config = CreateRealHardwareConfig();
+  scoped_ptr<media::AudioHardwareConfig> config =
+      CreateRealHardwareConfig(audio_manager_.get());
   SetAudioHardwareConfig(config.get());
 
   if (!HardwareSampleRatesAreValid())
     return;
 
   EXPECT_CALL(media_observer(),
       OnSetAudioStreamStatus(_, 1, StrEq("created"))).Times(1);
   EXPECT_CALL(media_observer(),
       OnSetAudioStreamPlaying(_, 1, true)).Times(1);
   EXPECT_CALL(media_observer(),
@@ skipping 56 matching lines @@
 #define MAYBE_FullDuplexAudioWithAGC DISABLED_FullDuplexAudioWithAGC
 #else
 #define MAYBE_FullDuplexAudioWithAGC FullDuplexAudioWithAGC
 #endif
 TEST_F(WebRTCAudioDeviceTest, MAYBE_FullDuplexAudioWithAGC) {
   if (!has_output_devices_ || !has_input_devices_) {
     LOG(WARNING) << "Missing audio devices.";
     return;
   }
 
-  scoped_ptr<media::AudioHardwareConfig> config = CreateRealHardwareConfig();
+  scoped_ptr<media::AudioHardwareConfig> config =
+      CreateRealHardwareConfig(audio_manager_.get());
   SetAudioHardwareConfig(config.get());
 
   if (!HardwareSampleRatesAreValid())
     return;
 
   EXPECT_CALL(media_observer(),
       OnSetAudioStreamStatus(_, 1, StrEq("created")));
   EXPECT_CALL(media_observer(),
       OnSetAudioStreamPlaying(_, 1, true));
   EXPECT_CALL(media_observer(),
@@ skipping 53 matching lines @@
 
   renderer->Stop();
   EXPECT_EQ(0, base->StopSend(ch));
   EXPECT_EQ(0, base->StopPlayout(ch));
 
   EXPECT_EQ(0, base->DeleteChannel(ch));
   EXPECT_EQ(0, base->Terminate());
 }
 
 }  // namespace content