Moving SwitchOutputDevice out of OutputDevice interface, eliminating OutputDevice

media/audio/audio_output_stream_sink.cc

 // 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.
 
 #include "media/audio/audio_output_stream_sink.h"
 
 #include <cmath>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 55 matching lines @@
   audio_task_runner_->PostTask(
       FROM_HERE, base::Bind(&AudioOutputStreamSink::DoPlay, this));
 }
 
 bool AudioOutputStreamSink::SetVolume(double volume) {
   audio_task_runner_->PostTask(
       FROM_HERE, base::Bind(&AudioOutputStreamSink::DoSetVolume, this, volume));
   return true;
 }
 
-OutputDevice* AudioOutputStreamSink::GetOutputDevice() {
-  return nullptr;
+OutputDeviceInfo AudioOutputStreamSink::GetOutputDeviceInfo() {
+  return OutputDeviceInfo();
 }
 
 int AudioOutputStreamSink::OnMoreData(AudioBus* dest,
                                       uint32_t total_bytes_delay,
                                       uint32_t frames_skipped) {
   // Note: Runs on the audio thread created by the OS.
   base::AutoLock al(callback_lock_);
   if (!active_render_callback_)
     return 0;
 
@@ skipping 55 matching lines @@
   DCHECK(audio_task_runner_->BelongsToCurrentThread());
   stream_->SetVolume(volume);
 }
 
 void AudioOutputStreamSink::ClearCallback() {
   base::AutoLock al(callback_lock_);
   active_render_callback_ = NULL;
 }
 
 }  // namepace media