MediaStream audio sourcing: Bypass audio processing for non-WebRTC cases.

content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc

Index: content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc
diff --git a/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc b/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc
index d23cfa9bfa2e40c931c3730e827f26740a06455e..50d690e80253d00826516cb98911652dea58f710 100644
--- a/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc
+++ b/content/renderer/media/webrtc/webrtc_media_stream_adapter_unittest.cc
@@ -8,15 +8,14 @@
 #include "base/message_loop/message_loop.h"
 #include "content/child/child_process.h"
 #include "content/renderer/media/media_stream.h"
-#include "content/renderer/media/media_stream_audio_source.h"
 #include "content/renderer/media/media_stream_video_source.h"
 #include "content/renderer/media/media_stream_video_track.h"
 #include "content/renderer/media/mock_media_constraint_factory.h"
 #include "content/renderer/media/mock_media_stream_video_source.h"
 #include "content/renderer/media/webrtc/mock_peer_connection_dependency_factory.h"
+#include "content/renderer/media/webrtc/processed_local_audio_source.h"
 #include "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h"
 #include "content/renderer/media/webrtc/webrtc_media_stream_adapter.h"
-#include "content/renderer/media/webrtc_local_audio_track.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebMediaStream.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
@@ -42,28 +41,23 @@ class WebRtcMediaStreamAdapterTest : public ::testing::Test {
     blink::WebVector<blink::WebMediaStreamTrack> audio_track_vector(
         audio ? static_cast<size_t>(1) : 0);
     if (audio) {
-      blink::WebMediaStreamSource audio_source;
-      audio_source.initialize("audio",
-                              blink::WebMediaStreamSource::TypeAudio,
-                              "audio",
-                              false /* remote */, true /* readonly */);
-      audio_source.setExtraData(new MediaStreamAudioSource());
-
-      audio_track_vector[0].initialize(audio_source);
-      StreamDeviceInfo device_info(MEDIA_DEVICE_AUDIO_CAPTURE, "Mock device",
-                                   "mock_device_id");
-      MockMediaConstraintFactory constraint_factory;
-      const blink::WebMediaConstraints constraints =
-          constraint_factory.CreateWebMediaConstraints();
-      scoped_refptr<WebRtcAudioCapturer> capturer(
-          WebRtcAudioCapturer::CreateCapturer(-1, device_info, constraints,
-                                              nullptr, nullptr));
-      scoped_refptr<WebRtcLocalAudioTrackAdapter> adapter(
-          WebRtcLocalAudioTrackAdapter::Create(
-              audio_track_vector[0].id().utf8(), nullptr));
-      scoped_ptr<WebRtcLocalAudioTrack> native_track(
-          new WebRtcLocalAudioTrack(adapter.get(), capturer, nullptr));
-      audio_track_vector[0].setExtraData(native_track.release());
+      blink::WebMediaStreamSource blink_audio_source;
+      blink_audio_source.initialize("audio",
+                                    blink::WebMediaStreamSource::TypeAudio,
+                                    "audio",
+                                    false /* remote */, true /* readonly */);
+      ProcessedLocalAudioSource* const audio_source =
+          new ProcessedLocalAudioSource(
+              -1,
+              StreamDeviceInfo(MEDIA_DEVICE_AUDIO_CAPTURE, "Mock device",
+                               "mock_device_id"),
+              dependency_factory_.get());
+      audio_source->SetAllowInvalidRenderFrameIdForTesting(true);
+      audio_source->SetSourceConstraints(
+          MockMediaConstraintFactory().CreateWebMediaConstraints());
+      blink_audio_source.setExtraData(audio_source);  // Takes ownership.
+      audio_track_vector[0].initialize(blink_audio_source);
+      CHECK(audio_source->ConnectToTrack(audio_track_vector[0]));
     }
 
     blink::WebVector<blink::WebMediaStreamTrack> video_track_vector(