Revert of MediaStream audio: Refactor 3 separate "glue" implementations into one.

content/renderer/media/user_media_client_impl.h

Index: content/renderer/media/user_media_client_impl.h
diff --git a/content/renderer/media/user_media_client_impl.h b/content/renderer/media/user_media_client_impl.h
index f920ca7420d40b624d3d0edbc3d94a20d60dc0bc..d4cfb25f00afbbd60cf845906b870dda270cb254 100644
--- a/content/renderer/media/user_media_client_impl.h
+++ b/content/renderer/media/user_media_client_impl.h
@@ -31,7 +31,6 @@
 
 namespace content {
 class PeerConnectionDependencyFactory;
-class MediaStreamAudioSource;
 class MediaStreamDispatcher;
 class MediaStreamVideoSource;
 class VideoCapturerDelegate;
@@ -120,12 +119,8 @@
   virtual void EnumerateSourcesSucceded(
       blink::WebMediaStreamTrackSourcesRequest* request,
       blink::WebVector<blink::WebSourceInfo>& sources);
-
-  // Creates a MediaStreamAudioSource/MediaStreamVideoSource objects.
-  // These are virtual for test purposes.
-  virtual MediaStreamAudioSource* CreateAudioSource(
-      const StreamDeviceInfo& device,
-      const blink::WebMediaConstraints& constraints);
+  // Creates a MediaStreamVideoSource object.
+  // This is virtual for test purposes.
   virtual MediaStreamVideoSource* CreateVideoSource(
       const StreamDeviceInfo& device,
       const MediaStreamSource::SourceStoppedCallback& stop_callback);
@@ -152,7 +147,8 @@
     blink::WebMediaStream web_stream;
     blink::WebUserMediaRequest request;
 
-    void StartAudioTrack(const blink::WebMediaStreamTrack& track);
+    void StartAudioTrack(const blink::WebMediaStreamTrack& track,
+                         const blink::WebMediaConstraints& constraints);
 
     blink::WebMediaStreamTrack CreateAndStartVideoTrack(
         const blink::WebMediaStreamSource& source,