Moving SwitchOutputDevice out of OutputDevice interface, eliminating OutputDevice

media/audio/audio_output_stream_sink.h

 // Copyright 2014 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_AUDIO_AUDIO_OUTPUT_STREAM_SINK_H_
 #define MEDIA_AUDIO_AUDIO_OUTPUT_STREAM_SINK_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 21 matching lines @@
   AudioOutputStreamSink();
 
   // RestartableAudioRendererSink implementation.
   void Initialize(const AudioParameters& params,
                   RenderCallback* callback) override;
   void Start() override;
   void Stop() override;
   void Pause() override;
   void Play() override;
   bool SetVolume(double volume) override;
-  OutputDevice* GetOutputDevice() override;
+  OutputDeviceInfo GetOutputDeviceInfo() override;
 
   // AudioSourceCallback implementation.
   int OnMoreData(AudioBus* dest,
                  uint32_t total_bytes_delay,
                  uint32_t frames_skipped) override;
   void OnError(AudioOutputStream* stream) override;
 
  private:
   ~AudioOutputStreamSink() override;
   void ClearCallback();
@@ skipping 28 matching lines @@
 
   // The actual AudioOutputStream, must only be accessed on the audio thread.
   AudioOutputStream* stream_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioOutputStreamSink);
 };
 
 }  // namepace media
 
 #endif  // MEDIA_AUDIO_AUDIO_OUTPUT_STREAM_SINK_H_