Moving SwitchOutputDevice out of OutputDevice interface, eliminating OutputDevice

content/renderer/media/audio_device_factory.h

Index: content/renderer/media/audio_device_factory.h
diff --git a/content/renderer/media/audio_device_factory.h b/content/renderer/media/audio_device_factory.h
index 749888ce0499d244cb405770fd6e1b80ee7780b0..bb513a045767f67f2c05b38054a957466eb94872 100644
--- a/content/renderer/media/audio_device_factory.h
+++ b/content/renderer/media/audio_device_factory.h
@@ -15,7 +15,6 @@
 
 namespace media {
 class AudioInputDevice;
-class AudioOutputDevice;
 }
 
 namespace url {
@@ -39,7 +38,7 @@ class CONTENT_EXPORT AudioDeviceFactory {
     kSourceLast = kSourceWebAudio  // Only used for validation of format.
   };
 
-  // Creates an AudioOutputDevice.
+  // Creates a sink for AudioRendererMixer.
   // |render_frame_id| refers to the RenderFrame containing the entity
   // producing the audio. If |session_id| is nonzero, it is used by the browser
   // to select the correct input device ID and its associated output device, if
@@ -47,7 +46,7 @@ class CONTENT_EXPORT AudioDeviceFactory {
   // identify the output device to use.
   // If |session_id| is zero and |device_id| and |security_origin| are empty,
   // the default output device will be selected.
-  static scoped_refptr<media::AudioOutputDevice> NewOutputDevice(
+  static scoped_refptr<media::AudioRendererSink> NewAudioRendererMixerSink(
       int render_frame_id,
       int session_id,
       const std::string& device_id,
@@ -65,15 +64,15 @@ class CONTENT_EXPORT AudioDeviceFactory {
       const std::string& device_id,
       const url::Origin& security_origin);
 
-  // Creates a RestartableAudioRendererSink bound to an AudioOutputDevice
+  // Creates a SwitchableAudioRendererSink bound to an AudioOutputDevice
   // Basing on |source_type| and build configuration, audio played out through
   // the sink goes to AOD directly or can be mixed with other audio before that.
-  static scoped_refptr<media::RestartableAudioRendererSink>
-  NewRestartableAudioRendererSink(SourceType source_type,
-                                  int render_frame_id,
-                                  int session_id,
-                                  const std::string& device_id,
-                                  const url::Origin& security_origin);
+  static scoped_refptr<media::SwitchableAudioRendererSink>
+  NewSwitchableAudioRendererSink(SourceType source_type,
+                                 int render_frame_id,
+                                 int session_id,
+                                 const std::string& device_id,
+                                 const url::Origin& security_origin);
 
   // A helper to get HW device status in the absence of AudioOutputDevice.
   static media::OutputDeviceStatus GetOutputDeviceStatus(
@@ -96,7 +95,7 @@ class CONTENT_EXPORT AudioDeviceFactory {
   // functions to provide alternate audio device implementations.
   // If the return value of either of these function is NULL, we fall back
   // on the default implementation.
-  virtual media::AudioOutputDevice* CreateOutputDevice(
+  virtual media::AudioRendererSink* CreateAudioRendererMixerSink(

[Guido Urdaneta, 2016/03/21 11:09:20]

Shouldn't all these methods return scoped_refptr?

[o1ka, 2016/03/21 11:50:31]

They are used in unit tests only now, initial design (CreateAudioOutputDevice)
was returning raw pointer. Do you still think it's better to switch to
scoped_refptr?

[Guido Urdaneta, 2016/03/21 12:01:36]

Yes. If you are returning a pointer that is intended to be owned by the caller,
you should wrap it in a smart pointer that carries ownership. AudioRendererSink
is refcounted, so use scoped_refptr. That it's currently used only for tests
shouldn't matter.

[o1ka, 2016/03/22 13:21:20]

Done.

       int render_frame_id,
       int sesssion_id,
       const std::string& device_id,
@@ -109,12 +108,12 @@ class CONTENT_EXPORT AudioDeviceFactory {
       const std::string& device_id,
       const url::Origin& security_origin) = 0;
 
-  virtual media::RestartableAudioRendererSink*
-  CreateRestartableAudioRendererSink(SourceType source_type,
-                                     int render_frame_id,
-                                     int sesssion_id,
-                                     const std::string& device_id,
-                                     const url::Origin& security_origin) = 0;
+  virtual media::SwitchableAudioRendererSink* CreateSwitchableAudioRendererSink(
+      SourceType source_type,
+      int render_frame_id,
+      int sesssion_id,
+      const std::string& device_id,
+      const url::Origin& security_origin) = 0;
 
   virtual media::AudioInputDevice* CreateInputDevice(int render_frame_id) = 0;