Moving SwitchOutputDevice out of OutputDevice interface, eliminating OutputDevice

media/base/output_device.h

Index: media/base/output_device.h
diff --git a/media/base/output_device.h b/media/base/output_device.h
index 76f88c78ed927ff1f9f27dc594fe5ae4e4e12fbf..f4e5362f792111972443af471c2b3ffa5825c4ee 100644
--- a/media/base/output_device.h
+++ b/media/base/output_device.h
@@ -23,28 +23,13 @@ enum OutputDeviceStatus {
   OUTPUT_DEVICE_STATUS_LAST = OUTPUT_DEVICE_STATUS_ERROR_INTERNAL,
 };
 
-typedef base::Callback<void(OutputDeviceStatus)> SwitchOutputDeviceCB;
+typedef base::Callback<void(OutputDeviceStatus)> OutputDeviceStatusCB;
 
 // OutputDevice is an interface that allows performing operations related
 // audio output devices.
 
 class OutputDevice {
  public:
-  // Attempts to switch the audio output device.
-  // Once the attempt is finished, |callback| is invoked with the
-  // result of the operation passed as a parameter. The result is a value from
-  // the  media::SwitchOutputDeviceResult enum.
-  // There is no guarantee about the thread where |callback| will
-  // be invoked, so users are advised to use media::BindToCurrentLoop() to
-  // ensure that |callback| runs on the correct thread.
-  // Note also that copy constructors and destructors for arguments bound to
-  // |callback| may run on arbitrary threads as |callback| is moved across
-  // threads. It is advisable to bind arguments such that they are released by
-  // |callback| when it runs in order to avoid surprises.
-  virtual void SwitchOutputDevice(const std::string& device_id,
-                                  const url::Origin& security_origin,
-                                  const SwitchOutputDeviceCB& callback) = 0;
-
   // Returns the device's audio output parameters.
   // The return value is undefined if the device status (as returned by
   // GetDeviceStatus()) is different from OUTPUT_DEVICE_STATUS_OK.
@@ -58,6 +43,9 @@ class OutputDevice {
   // available. Must never be called on the IO thread.
   virtual OutputDeviceStatus GetDeviceStatus() = 0;
 
+  // Returns the device ID.
+  virtual std::string GetDeviceId() = 0;
+
  protected:
   virtual ~OutputDevice() {}
 };