move the APM to chrome.

content/renderer/media/media_stream_dependency_factory.cc

Index: content/renderer/media/media_stream_dependency_factory.cc
diff --git a/content/renderer/media/media_stream_dependency_factory.cc b/content/renderer/media/media_stream_dependency_factory.cc
index 9e8b69b2f9f34163d9b5e9d1182766c97190874f..7fc155a2195b6411bb281d70cb9ac3f94317f151 100644
--- a/content/renderer/media/media_stream_dependency_factory.cc
+++ b/content/renderer/media/media_stream_dependency_factory.cc
@@ -65,7 +65,7 @@ struct {
   { webrtc::MediaConstraintsInterface::kAutoGainControl,
     webrtc::MediaConstraintsInterface::kValueTrue },
   { webrtc::MediaConstraintsInterface::kExperimentalAutoGainControl,
-    webrtc::MediaConstraintsInterface::kValueTrue },
+    webrtc::MediaConstraintsInterface::kValueFalse },
   { webrtc::MediaConstraintsInterface::kNoiseSuppression,
     webrtc::MediaConstraintsInterface::kValueTrue },
   { webrtc::MediaConstraintsInterface::kHighpassFilter,
@@ -441,11 +441,11 @@ bool MediaStreamDependencyFactory::AddNativeMediaStreamTrack(
                               webaudio_source.get(),
                               source_data->local_audio_source(),
                               &track_constraints));
+    // Set the source provider to the webkit.
+    WebKit::WebMediaStreamTrack writable_track = track;
+    writable_track.setSourceProvider(static_cast<WebRtcLocalAudioTrack*>(
+        audio_track.get())->audio_source_provider());
     audio_track->set_enabled(track.isEnabled());
-    if (capturer.get()) {
-      WebKit::WebMediaStreamTrack writable_track = track;
-      writable_track.setSourceProvider(capturer->audio_source_provider());
-    }
     return native_stream->AddTrack(audio_track.get());
   } else {
     DCHECK(source.type() == WebKit::WebMediaStreamSource::TypeVideo);
@@ -672,7 +672,8 @@ MediaStreamDependencyFactory::CreateLocalAudioTrack(
   // for each audio track.
   scoped_refptr<WebRtcLocalAudioTrack> audio_track(
       WebRtcLocalAudioTrack::Create(id, capturer, webaudio_source,
-                                    source, constraints));
+                                    source, constraints,
+                                    GetWebRtcAudioDevice()));
 
   // Add the WebRtcAudioDevice as the sink to the local audio track.
   audio_track->AddSink(GetWebRtcAudioDevice());