Revert 187936 "Pass more detailed audio hardware configuration i..."

content/renderer/media/audio_renderer_mixer_manager_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/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/renderer/media/audio_renderer_mixer_manager.h"
-#include "media/audio/audio_parameters.h"
 #include "media/base/audio_hardware_config.h"
 #include "media/base/audio_renderer_mixer.h"
 #include "media/base/audio_renderer_mixer_input.h"
 #include "media/base/fake_audio_render_callback.h"
 #include "media/base/mock_audio_renderer_sink.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 static const int kBitsPerChannel = 16;
 static const int kSampleRate = 48000;
 static const int kBufferSize = 8192;
 static const media::ChannelLayout kChannelLayout = media::CHANNEL_LAYOUT_STEREO;
 
 static const int kRenderViewId = 123;
 static const int kAnotherRenderViewId = 456;
 
-using media::AudioParameters;
-
 class AudioRendererMixerManagerTest : public testing::Test {
  public:
   AudioRendererMixerManagerTest()
-      : fake_config_(AudioParameters(), AudioParameters()) {
-    AudioParameters output_params(
-        media::AudioParameters::AUDIO_PCM_LOW_LATENCY,
-        media::CHANNEL_LAYOUT_STEREO,
-        kSampleRate,
-        16,
-        kBufferSize);
-    fake_config_.UpdateOutputConfig(output_params);
-
+      : fake_config_(kBufferSize, kSampleRate, 0, media::CHANNEL_LAYOUT_NONE) {
     manager_.reset(new AudioRendererMixerManager(&fake_config_));
 
     // We don't want to deal with instantiating a real AudioOutputDevice since
     // it's not important to our testing, so we inject a mock.
     mock_sink_ = new media::MockAudioRendererSink();
     manager_->SetAudioRendererSinkForTesting(mock_sink_);
   }
 
   media::AudioRendererMixer* GetMixer(int source_render_view_id,
                                       const media::AudioParameters& params) {
@@ skipping 95 matching lines @@
   EXPECT_EQ(mixer_count(), 2);
 
   // Destroying the inputs should destroy the mixers.
   input = NULL;
   EXPECT_EQ(mixer_count(), 1);
   another_input = NULL;
   EXPECT_EQ(mixer_count(), 0);
 }
 
 }  // namespace content