Moving SwitchOutputDevice out of OutputDevice interface, eliminating OutputDevice

media/base/audio_renderer_mixer.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 MEDIA_BASE_AUDIO_RENDERER_MIXER_H_
 #define MEDIA_BASE_AUDIO_RENDERER_MIXER_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 28 matching lines @@
   // Since errors may occur even when no inputs are playing, an error callback
   // must be registered separately from adding a mixer input.  The same callback
   // must be given to both the functions.
   void AddErrorCallback(const base::Closure& error_cb);
   void RemoveErrorCallback(const base::Closure& error_cb);
 
   void set_pause_delay_for_testing(base::TimeDelta delay) {
     pause_delay_ = delay;
   }
 
-  // TODO(guidou): remove this method. The output device of a mixer should
-  // never be switched, as it may result in a discrepancy between the output
-  // parameters of the new device and the output parameters with which the
-  // mixer was initialized. See crbug.com/506507
-  OutputDevice* GetOutputDevice();
+  OutputDeviceInfo GetOutputDeviceInfo();
 
  private:
   // Maps input sample rate to the dedicated converter.
   typedef std::map<int, scoped_ptr<LoopbackAudioConverter>> AudioConvertersMap;
 
   // AudioRendererSink::RenderCallback implementation.
   int Render(AudioBus* audio_bus,
              uint32_t frames_delayed,
              uint32_t frames_skipped) override;
   void OnRenderError() override;
@@ skipping 29 matching lines @@
   base::TimeDelta pause_delay_;
   base::TimeTicks last_play_time_;
   bool playing_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioRendererMixer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_AUDIO_RENDERER_MIXER_H_