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

content/renderer/media/mock_media_stream_registry.cc

Index: content/renderer/media/mock_media_stream_registry.cc
diff --git a/content/renderer/media/mock_media_stream_registry.cc b/content/renderer/media/mock_media_stream_registry.cc
index a37ca33b751f3b213dc710599ee66dbf3a2ac909..1f9da8c481bddffd063e1cac85792ef8927cc731 100644
--- a/content/renderer/media/mock_media_stream_registry.cc
+++ b/content/renderer/media/mock_media_stream_registry.cc
@@ -10,10 +10,7 @@
 #include "content/renderer/media/media_stream.h"
 #include "content/renderer/media/media_stream_audio_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/webrtc_local_audio_track_adapter.h"
-#include "content/renderer/media/webrtc_local_audio_track.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
 #include "third_party/WebKit/public/platform/WebString.h"
@@ -21,7 +18,30 @@
 
 namespace content {
 
-static const char kTestStreamLabel[] = "stream_label";
+namespace {
+
+const char kTestStreamLabel[] = "stream_label";
+
+class MockCDQualityAudioSource : public MediaStreamAudioSource {
+ public:
+  MockCDQualityAudioSource() : MediaStreamAudioSource(false /* is_remote */) {
+    MediaStreamAudioSource::SetFormat(media::AudioParameters(
+        media::AudioParameters::AUDIO_PCM_LOW_LATENCY,
+        media::CHANNEL_LAYOUT_STEREO,
+        media::AudioParameters::kAudioCDSampleRate,
+        16,
+        media::AudioParameters::kAudioCDSampleRate / 100));
+    MediaStreamAudioSource::SetDeviceInfo(StreamDeviceInfo(
+        MEDIA_DEVICE_AUDIO_CAPTURE, "Mock audio device", "mock_audio_device_id",
+        media::AudioParameters::kAudioCDSampleRate, media::CHANNEL_LAYOUT_STEREO,
+        media::AudioParameters::kAudioCDSampleRate / 100));
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(MockCDQualityAudioSource);
+};
+
+}  // namespace
 
 MockMediaStreamRegistry::MockMediaStreamRegistry() {}
 
@@ -56,29 +76,16 @@ void MockMediaStreamRegistry::AddVideoTrack(const std::string& track_id) {
 }
 
 void MockMediaStreamRegistry::AddAudioTrack(const std::string& track_id) {
-  blink::WebMediaStreamSource audio_source;
-  audio_source.initialize(
+  blink::WebMediaStreamSource blink_source;
+  blink_source.initialize(
       "mock audio source id", blink::WebMediaStreamSource::TypeAudio,
       "mock audio source name", false /* remote */, true /* readonly */);
-  audio_source.setExtraData(new MediaStreamAudioSource());
+  blink_source.setExtraData(new MockCDQualityAudioSource());
+
   blink::WebMediaStreamTrack blink_track;
-  blink_track.initialize(audio_source);
-  const StreamDeviceInfo device_info(
-      MEDIA_DEVICE_AUDIO_CAPTURE, "Mock audio device", "mock_audio_device_id");
-  const MockMediaConstraintFactory constraint_factory;
-  const blink::WebMediaConstraints constraints =
-      constraint_factory.CreateWebMediaConstraints();
-  const scoped_refptr<WebRtcAudioCapturer> capturer(
-      WebRtcAudioCapturer::CreateCapturer(-1, /* render frame id */
-                                          device_info, constraints,
-                                          nullptr, /* audio device */
-                                          nullptr /* audio source */));
-  const scoped_refptr<WebRtcLocalAudioTrackAdapter> adapter(
-      WebRtcLocalAudioTrackAdapter::Create(track_id,
-                                           nullptr /* track source */));
-  scoped_ptr<WebRtcLocalAudioTrack> native_track(new WebRtcLocalAudioTrack(
-      adapter.get(), capturer, nullptr /* webaudio source */));
-  blink_track.setExtraData(native_track.release());
+  blink_track.initialize(blink_source);
+  CHECK(MediaStreamAudioSource::Get(blink_source)->ConnectToTrack(blink_track));
+
   test_stream_.addTrack(blink_track);
 }