Moving SwitchOutputDevice out of OutputDevice interface, eliminating OutputDevice

media/audio/audio_output_device.h

Index: media/audio/audio_output_device.h
diff --git a/media/audio/audio_output_device.h b/media/audio/audio_output_device.h
index 26f711d38aca1ec3ef7143577b8e8e4df3335e78..70c29139d2d940c4f68599f24939b41b7687cec2 100644
--- a/media/audio/audio_output_device.h
+++ b/media/audio/audio_output_device.h
@@ -109,6 +109,7 @@ class MEDIA_EXPORT AudioOutputDevice
   // OutputDevice implementation
   AudioParameters GetOutputParameters() override;
   OutputDeviceStatus GetDeviceStatus() override;
+  std::string GetDeviceId() override;
 
   // Methods called on IO thread ----------------------------------------------
   // AudioOutputIPCDelegate methods.
@@ -138,11 +139,6 @@ class MEDIA_EXPORT AudioOutputDevice
     PLAYING,  // Playing back.  Can Pause()/Stop().
   };
 
-  // Unsupported OutputDevice implementation
-  void SwitchOutputDevice(const std::string& device_id,
-                          const url::Origin& security_origin,
-                          const SwitchOutputDeviceCB& callback) override;
-
   // Methods called on IO thread ----------------------------------------------
   // The following methods are tasks posted on the IO thread that need to
   // be executed on that thread.  They use AudioOutputIPC to send IPC messages