Moving SwitchOutputDevice out of OutputDevice interface, eliminating OutputDevice

media/base/mock_audio_renderer_sink.cc

Index: media/base/mock_audio_renderer_sink.cc
diff --git a/media/base/mock_audio_renderer_sink.cc b/media/base/mock_audio_renderer_sink.cc
index 79653b2f8232c2b0688a9ec95232101495530d9b..4b46129b20db610048b3ea64716890f90ff4edcb 100644
--- a/media/base/mock_audio_renderer_sink.cc
+++ b/media/base/mock_audio_renderer_sink.cc
@@ -10,10 +10,42 @@ MockAudioRendererSink::MockAudioRendererSink()
     : MockAudioRendererSink(OUTPUT_DEVICE_STATUS_OK) {}
 
 MockAudioRendererSink::MockAudioRendererSink(OutputDeviceStatus device_status)
-    : output_device_(new FakeOutputDevice(device_status)) {}
+    : device_factory_(nullptr),
+      output_device_(new FakeOutputDevice(std::string(), device_status)) {}
+
+MockAudioRendererSink::MockAudioRendererSink(const std::string& device_id,
+                                             OutputDeviceStatus device_status)
+    : device_factory_(nullptr),
+      output_device_(new FakeOutputDevice(device_id, device_status)) {}
+
+MockAudioRendererSink::MockAudioRendererSink(
+    const std::string& device_id,
+    OutputDeviceStatus device_status,
+    const AudioParameters& device_output_params)
+    : device_factory_(nullptr),
+      output_device_(new FakeOutputDevice(device_id,
+                                          device_status,
+                                          device_output_params)) {}
+
+MockAudioRendererSink::MockAudioRendererSink(
+    FakeOutputDeviceFactory* device_factory,
+    const std::string& device_id)
+    : device_factory_(device_factory),
+      output_device_(device_factory_->NewFakeOutputDevice(device_id)) {}
 
 MockAudioRendererSink::~MockAudioRendererSink() {}
 
+void MockAudioRendererSink::SwitchOutputDevice(
+    const std::string& device_id,
+    const url::Origin& security_origin,
+    const SwitchOutputDeviceCB& callback) {
+  // NB: output device won't be changed if no factory is provided at
+  // construction time.
+  if (device_factory_)
+    output_device_.reset(device_factory_->NewFakeOutputDevice(device_id));
+  callback.Run(output_device_->GetDeviceStatus());
+}
+
 void MockAudioRendererSink::Initialize(const AudioParameters& params,
                                        RenderCallback* renderer) {
   callback_ = renderer;