First step towards moving AudioDevice from content/ to media/audio.

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 b15e96701c94e67eb3c232d4361dbc9139a307ad..ed15f8a7201a3d72a4b420d99b09c9f5336dd177 100644
--- a/content/renderer/media/audio_device_factory.h
+++ b/content/renderer/media/audio_device_factory.h
@@ -12,6 +12,8 @@ namespace media {
 class AudioRendererSink;
 }
 
+class AudioInputDevice;
+
 namespace content {
 
 // A factory for creating AudioRendererSinks. There is a global factory
@@ -23,17 +25,25 @@ class CONTENT_EXPORT AudioDeviceFactory {
   // Creates an AudioRendererSink using the currently registered factory,
   // or the default one if no factory is registered. Ownership of the returned
   // pointer will be passed to the caller.
- static media::AudioRendererSink* Create();
+ static media::AudioRendererSink* NewOutputDevice();

[scherkus (not reviewing), 2012/07/25 22:34:11]

hrmm.. these names are a bit strange

it's an AudioDeviceFactory that creates AudioRendererSinks?!

I don't have any real concrete suggestions though :\

[tommi (sloooow) - chröme, 2012/07/26 09:19:36]

I agree.  I think AudioDeviceFactory is fine but AudioRendererSink could do with
improving.  We could rename that interface to something like AudioOutputClient,
AudioOutputProxy, AudioOutputInterface etc and add a similar definition for
AudioInputDevice.

Alternatively, we could rename the implementations of these interfaces and use
AudioOutputDevice, AudioInputDevice as names for the interfaces and rename the
implementation classes to Audio[Output|Input]DeviceImpl.  Since that pattern is
pretty common in Chrome so maybe that's the way to go.

[scherkus (not reviewing), 2012/07/26 17:57:31]

I think the *Impl idea has some legs -- the one thing to watch out for (having
committed this crime myself!) is that we don't end up with two Impls in
different namespaces (i.e., one in media:: for testing and one in content::
that's the "real" one)

+
+ // TODO(henrika): Update AudioInputDevice to inherit from an interface
+ // similar to AudioRendererSink, but for input.  Same for the callback
+ // interfaces.
+ static AudioInputDevice* NewInputDevice();
 
  protected:
   AudioDeviceFactory();
   virtual ~AudioDeviceFactory();
 
-  // You can derive from this class and specify an implementation for this
-  // function to create a different kind of AudioRendererSink for testing.
-  virtual media::AudioRendererSink* CreateAudioDevice() = 0;
+  // You can derive from this class and specify an implementation for these
+  // 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::AudioRendererSink* CreateOutputDevice() = 0;
+  virtual AudioInputDevice* CreateInputDevice() = 0;
 
- private:
+private:

[scherkus (not reviewing), 2012/07/25 22:34:11]

indent

[tommi (sloooow) - chröme, 2012/07/26 09:19:36]

Done.

   // The current globally registered factory. This is NULL when we should
   // create the default AudioRendererSinks.
   static AudioDeviceFactory* factory_;