Moving SwitchOutputDevice out of OutputDevice interface, eliminating OutputDevice

media/base/fake_output_device.cc

Index: media/base/fake_output_device.cc
diff --git a/media/base/fake_output_device.cc b/media/base/fake_output_device.cc
index 2f7c8e70062369dc0338ac0b8ecd65e3cc6210e4..f9aaaa1c789e33289ca06833b2fb6fae49d5e0a2 100644
--- a/media/base/fake_output_device.cc
+++ b/media/base/fake_output_device.cc
@@ -9,28 +9,36 @@
 namespace media {
 
 FakeOutputDevice::FakeOutputDevice()
-    : FakeOutputDevice(OUTPUT_DEVICE_STATUS_OK) {}
-
-FakeOutputDevice::FakeOutputDevice(OutputDeviceStatus device_status)
-    : device_status_(device_status) {}
+    : FakeOutputDevice(std::string(), OUTPUT_DEVICE_STATUS_OK) {}
+
+FakeOutputDevice::FakeOutputDevice(const std::string& device_id,
+                                   OutputDeviceStatus status)
+    : FakeOutputDevice(
+          device_id,
+          status,
+          media::AudioParameters(media::AudioParameters::AUDIO_FAKE,
+                                 media::CHANNEL_LAYOUT_STEREO,
+                                 media::AudioParameters::kTelephoneSampleRate,
+                                 16,
+                                 1)) {}
+
+FakeOutputDevice::FakeOutputDevice(const std::string& device_id,
+                                   OutputDeviceStatus status,
+                                   const AudioParameters& params)
+    : device_id_(device_id), status_(status), params_(params) {}
 
 FakeOutputDevice::~FakeOutputDevice() {}
 
-void FakeOutputDevice::SwitchOutputDevice(
-    const std::string& device_id,
-    const url::Origin& security_origin,
-    const SwitchOutputDeviceCB& callback) {
-  callback.Run(device_status_);
-}
-
 AudioParameters FakeOutputDevice::GetOutputParameters() {
-  return media::AudioParameters(
-      media::AudioParameters::AUDIO_FAKE, media::CHANNEL_LAYOUT_STEREO,
-      media::AudioParameters::kTelephoneSampleRate, 16, 1);
+  return params_;
 }
 
 OutputDeviceStatus FakeOutputDevice::GetDeviceStatus() {
-  return device_status_;
+  return status_;
+}
+
+std::string FakeOutputDevice::GetDeviceId() {
+  return device_id_;
 }
 
 }  // namespace media