Moving SwitchOutputDevice out of OutputDevice interface, eliminating OutputDevice

media/audio/audio_output_device.cc

Index: media/audio/audio_output_device.cc
diff --git a/media/audio/audio_output_device.cc b/media/audio/audio_output_device.cc
index 7044e9ae770649c0477b9b37af56eca6fff01abb..031f215705975100b1da0884e9fe8e3783dd856c 100644
--- a/media/audio/audio_output_device.cc
+++ b/media/audio/audio_output_device.cc
@@ -142,13 +142,6 @@ OutputDevice* AudioOutputDevice::GetOutputDevice() {
   return this;
 }
 
-void AudioOutputDevice::SwitchOutputDevice(
-    const std::string& device_id,
-    const url::Origin& security_origin,
-    const SwitchOutputDeviceCB& callback) {
-  NOTREACHED();
-}
-
 AudioParameters AudioOutputDevice::GetOutputParameters() {
   CHECK(!task_runner()->BelongsToCurrentThread());
   did_receive_auth_.Wait();
@@ -161,6 +154,12 @@ OutputDeviceStatus AudioOutputDevice::GetDeviceStatus() {
   return device_status_;
 }
 
+std::string AudioOutputDevice::GetDeviceId() {
+  CHECK(!task_runner()->BelongsToCurrentThread());
+  did_receive_auth_.Wait();
+  return device_id_;
+}
+
 void AudioOutputDevice::RequestDeviceAuthorizationOnIOThread() {
   DCHECK(task_runner()->BelongsToCurrentThread());
   DCHECK_EQ(state_, IDLE);