Revert of MediaStream audio object graph untangling and clean-ups.

content/renderer/media/webrtc/peer_connection_dependency_factory.h

Index: content/renderer/media/webrtc/peer_connection_dependency_factory.h
diff --git a/content/renderer/media/webrtc/peer_connection_dependency_factory.h b/content/renderer/media/webrtc/peer_connection_dependency_factory.h
index 03c3a1a594e576388bfe46f9091ed0edd24a1d61..108785bade26cb16e095c24549e531c7d6220398 100644
--- a/content/renderer/media/webrtc/peer_connection_dependency_factory.h
+++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.h
@@ -152,9 +152,9 @@
   // Creates a media::AudioCapturerSource with an implementation that is
   // specific for a WebAudio source. The created WebAudioCapturerSource
   // instance will function as audio source instead of the default
-  // WebRtcAudioCapturer. Ownership of the new WebAudioCapturerSource is
-  // transferred to |source|.
-  virtual void CreateWebAudioSource(blink::WebMediaStreamSource* source);
+  // WebRtcAudioCapturer.
+  virtual scoped_refptr<WebAudioCapturerSource> CreateWebAudioSource(
+      blink::WebMediaStreamSource* source);
 
   // Asks the PeerConnection factory to create a Local VideoTrack object with
   // the video source using |capturer|.
@@ -169,11 +169,16 @@
   // Returns a new capturer or existing capturer based on the |render_frame_id|
   // and |device_info|; if both are valid, it reuses existing capture if any --
   // otherwise it creates a new capturer.
-  virtual scoped_ptr<WebRtcAudioCapturer> CreateAudioCapturer(
+  virtual scoped_refptr<WebRtcAudioCapturer> CreateAudioCapturer(
       int render_frame_id,
       const StreamDeviceInfo& device_info,
       const blink::WebMediaConstraints& constraints,
       MediaStreamAudioSource* audio_source);
+
+  // Adds the audio device as a sink to the audio track and starts the local
+  // audio track. This is virtual for test purposes since no real audio device
+  // exist in unit tests.
+  virtual void StartLocalAudioTrack(WebRtcLocalAudioTrack* audio_track);
 
  private:
   // Implement base::MessageLoop::DestructionObserver.