Cleaned up the WebRtcAudioCapturer a bit.

content/renderer/media/mock_media_stream_dependency_factory.cc

Index: content/renderer/media/mock_media_stream_dependency_factory.cc
diff --git a/content/renderer/media/mock_media_stream_dependency_factory.cc b/content/renderer/media/mock_media_stream_dependency_factory.cc
index 9218fa1e04a0eebc0c6df99f38a067e66296384b..da5739d2b21d59b6e7f3f13a74d0573bea843991 100644
--- a/content/renderer/media/mock_media_stream_dependency_factory.cc
+++ b/content/renderer/media/mock_media_stream_dependency_factory.cc
@@ -455,10 +455,11 @@ MockMediaStreamDependencyFactory::CreateLocalAudioTrack(
     webrtc::AudioSourceInterface* source,
     const webrtc::MediaConstraintsInterface* constraints) {
   DCHECK(mock_pc_factory_created_);
-  DCHECK(!capturer.get());
+  scoped_refptr<WebRtcAudioCapturer> audio_capturer = capturer ?
+      capturer : WebRtcAudioCapturer::CreateCapturer(-1, StreamDeviceInfo(),
+                                                     NULL);
   return WebRtcLocalAudioTrack::Create(
-      id, WebRtcAudioCapturer::CreateCapturer(), webaudio_source,
-      source, constraints);
+      id, audio_capturer, webaudio_source, source, constraints);
 }
 
 SessionDescriptionInterface*
@@ -478,9 +479,9 @@ MockMediaStreamDependencyFactory::CreateIceCandidate(
 }
 
 scoped_refptr<WebRtcAudioCapturer>
-MockMediaStreamDependencyFactory::MaybeCreateAudioCapturer(
+MockMediaStreamDependencyFactory::CreateAudioCapturer(
     int render_view_id, const StreamDeviceInfo& device_info) {
-  return WebRtcAudioCapturer::CreateCapturer();
+  return WebRtcAudioCapturer::CreateCapturer(-1, device_info, NULL);
 }
 
 }  // namespace content