Moving SwitchOutputDevice out of OutputDevice interface, eliminating OutputDevice

content/renderer/media/audio_renderer_mixer_manager.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_AUDIO_RENDERER_MIXER_MANAGER_H_
 #define CONTENT_RENDERER_MEDIA_AUDIO_RENDERER_MIXER_MANAGER_H_
 
 #include <map>
 #include <string>
 #include <utility>
@@ skipping 104 matching lines @@
   struct AudioRendererMixerReference {
     media::AudioRendererMixer* mixer;
     int ref_count;
   };
   typedef std::map<MixerKey, AudioRendererMixerReference, MixerKeyCompare>
       AudioRendererMixerMap;
 
   // Overrides the AudioRendererSink implementation for unit testing.
   void SetAudioRendererSinkForTesting(media::AudioRendererSink* sink);
 
-  // A helper to get hardware output parameters in the absence of
-  // AudioOutputDevice.
-  static media::AudioParameters GetHardwareOutputParams(
+  // A helper provided to AudioRendererMixerInput to access output device
+  static media::OutputDevice* GetOutputDevice(
       int render_frame_id,
       int session_id,
       const std::string& device_id,
       const url::Origin& security_origin);
 
   // Active mixers.
   AudioRendererMixerMap mixers_;
   base::Lock mixers_lock_;
 
-  media::AudioRendererSink* sink_for_testing_;
-
   DISALLOW_COPY_AND_ASSIGN(AudioRendererMixerManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_AUDIO_RENDERER_MIXER_MANAGER_H_