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..545aa7588022947a28bb01dc1f8a0e66b46f9f11 100644
--- a/media/base/audio_renderer_mixer_unittest.cc
+++ b/media/base/audio_renderer_mixer_unittest.cc
@@ -95,8 +95,8 @@ class AudioRendererMixerTest
                     const std::string&,
                     const url::Origin&));
 
-  MOCK_METHOD2(GetOutputHWParams,
-               AudioParameters(const std::string&, const url::Origin&));
+  MOCK_METHOD2(GetOutputDevice,
+               OutputDevice*(const std::string&, const url::Origin&));
 
   void InitializeInputs(int inputs_per_sample_rate) {
     mixer_inputs_.reserve(inputs_per_sample_rate * input_parameters_.size());
@@ -119,7 +119,7 @@ class AudioRendererMixerTest
                        base::Unretained(this)),
             base::Bind(&AudioRendererMixerTest::RemoveMixer,
                        base::Unretained(this)),
-            base::Bind(&AudioRendererMixerTest::GetOutputHWParams,
+            base::Bind(&AudioRendererMixerTest::GetOutputDevice,
                        base::Unretained(this)),
             // Default device ID and security origin.
             std::string(), url::Origin()));
@@ -474,7 +474,7 @@ TEST_P(AudioRendererMixerBehavioralTest, NoInitialize) {
           base::Bind(&AudioRendererMixerTest::GetMixer, base::Unretained(this)),
           base::Bind(&AudioRendererMixerTest::RemoveMixer,
                      base::Unretained(this)),
-          base::Bind(&AudioRendererMixerTest::GetOutputHWParams,
+          base::Bind(&AudioRendererMixerTest::GetOutputDevice,
                      base::Unretained(this)),
           // Default device ID and security origin.
           std::string(), url::Origin());