Moving SwitchOutputDevice out of OutputDevice interface, eliminating OutputDevice

media/base/audio_renderer_mixer_unittest.cc

Index: media/base/audio_renderer_mixer_unittest.cc
diff --git a/media/base/audio_renderer_mixer_unittest.cc b/media/base/audio_renderer_mixer_unittest.cc
index 102a773e2f316f184cc4909197d9cf4fe54c15d4..f338a69603166703d0a0fc6e9a3e0272ad404d52 100644
--- a/media/base/audio_renderer_mixer_unittest.cc
+++ b/media/base/audio_renderer_mixer_unittest.cc
@@ -95,9 +95,6 @@ class AudioRendererMixerTest
                     const std::string&,
                     const url::Origin&));
 
-  MOCK_METHOD2(GetOutputHWParams,
-               AudioParameters(const std::string&, const url::Origin&));
-
   void InitializeInputs(int inputs_per_sample_rate) {
     mixer_inputs_.reserve(inputs_per_sample_rate * input_parameters_.size());
     fake_callbacks_.reserve(inputs_per_sample_rate * input_parameters_.size());
@@ -119,8 +116,6 @@ class AudioRendererMixerTest
                        base::Unretained(this)),
             base::Bind(&AudioRendererMixerTest::RemoveMixer,
                        base::Unretained(this)),
-            base::Bind(&AudioRendererMixerTest::GetOutputHWParams,
-                       base::Unretained(this)),
             // Default device ID and security origin.
             std::string(), url::Origin()));
         mixer_inputs_[input]->Initialize(input_parameters_[i],
@@ -469,13 +464,11 @@ TEST_P(AudioRendererMixerBehavioralTest, OnRenderErrorPausedInput) {
 // not call RemoveMixer().
 TEST_P(AudioRendererMixerBehavioralTest, NoInitialize) {
   EXPECT_CALL(*this, RemoveMixer(testing::_, testing::_, testing::_)).Times(0);
-  scoped_refptr<AudioRendererMixerInput> audio_renderer_mixer =
+  scoped_refptr<AudioRendererMixerInput> audio_renderer_mixer_input =
       new AudioRendererMixerInput(
           base::Bind(&AudioRendererMixerTest::GetMixer, base::Unretained(this)),
           base::Bind(&AudioRendererMixerTest::RemoveMixer,
                      base::Unretained(this)),
-          base::Bind(&AudioRendererMixerTest::GetOutputHWParams,
-                     base::Unretained(this)),
           // Default device ID and security origin.
           std::string(), url::Origin());
 }