Moving SwitchOutputDevice out of OutputDevice interface, eliminating OutputDevice

media/base/fake_audio_renderer_sink.cc

 // Copyright 2013 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/base/fake_audio_renderer_sink.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
-#include "base/single_thread_task_runner.h"
-#include "media/base/fake_output_device.h"
 
 namespace media {
 
 FakeAudioRendererSink::FakeAudioRendererSink()
     : state_(kUninitialized),
       callback_(NULL),
-      output_device_(new FakeOutputDevice) {}
+      output_device_info_(
+          std::string(),
+          OUTPUT_DEVICE_STATUS_OK,
+          media::AudioParameters(media::AudioParameters::AUDIO_FAKE,
+                                 media::CHANNEL_LAYOUT_STEREO,
+                                 media::AudioParameters::kTelephoneSampleRate,
+                                 16,

[miu, 2016/03/24 21:32:02]

Side Note: At some point, we should evaluate whether the bits_per_sample
property in AudioParameters can be eliminated.  IMO, we should try to get rid of
it since audio data is passed around in planar float format everywhere.

[o1ka, 2016/03/29 13:39:54]

Yes, we should consider this.

+                                 1)) {}
 
 FakeAudioRendererSink::~FakeAudioRendererSink() {
   DCHECK(!callback_);
 }
 
 void FakeAudioRendererSink::Initialize(const AudioParameters& params,
                                        RenderCallback* callback) {
   DCHECK_EQ(state_, kUninitialized);
   DCHECK(!callback_);
   DCHECK(callback);
@@ skipping 20 matching lines @@
 void FakeAudioRendererSink::Play() {
   DCHECK(state_ == kStarted || state_ == kPaused) << "state_ " << state_;
   DCHECK_EQ(state_, kPaused);
   ChangeState(kPlaying);
 }
 
 bool FakeAudioRendererSink::SetVolume(double volume) {
   return true;
 }
 
-OutputDevice* FakeAudioRendererSink::GetOutputDevice() {
-  return output_device_.get();
+OutputDeviceInfo FakeAudioRendererSink::GetOutputDeviceInfo() {
+  return output_device_info_;
 }
 
 bool FakeAudioRendererSink::Render(AudioBus* dest,
                                    uint32_t audio_delay_milliseconds,
                                    int* frames_written) {
   if (state_ != kPlaying)
     return false;
 
   *frames_written = callback_->Render(dest, audio_delay_milliseconds, 0);
   return true;
@@ skipping 15 matching lines @@
     "kPlaying",
     "kStopped"
   };
 
   DVLOG(1) << __FUNCTION__ << " : "
            << kStateNames[state_] << " -> " << kStateNames[new_state];
   state_ = new_state;
 }
 
 }  // namespace media