Enable new getUserMedia audio constraints algorithm behind a flag.

content/renderer/media/webrtc/processed_local_audio_source_unittest.cc

Index: content/renderer/media/webrtc/processed_local_audio_source_unittest.cc
diff --git a/content/renderer/media/webrtc/processed_local_audio_source_unittest.cc b/content/renderer/media/webrtc/processed_local_audio_source_unittest.cc
index 95bf66d6f7d5030d2d2439806ba89c2714474da7..75cd5e57dc8e8769a2baacf0fda2e9d9b06f8f4c 100644
--- a/content/renderer/media/webrtc/processed_local_audio_source_unittest.cc
+++ b/content/renderer/media/webrtc/processed_local_audio_source_unittest.cc
@@ -9,6 +9,7 @@
 #include "base/message_loop/message_loop.h"
 #include "build/build_config.h"
 #include "content/public/renderer/media_stream_audio_sink.h"
+#include "content/renderer/media/media_stream_audio_processor_options.h"
 #include "content/renderer/media/media_stream_audio_track.h"
 #include "content/renderer/media/mock_audio_device_factory.h"
 #include "content/renderer/media/mock_constraint_factory.h"

[hbos_chromium, 2017/06/16 17:27:14]

nit: Here and perhaps other files: remove inclusion of mock_constraint_factory.h

[Guido Urdaneta, 2017/06/19 11:56:49]

Done.

@@ -72,6 +73,20 @@ class MockMediaStreamAudioSink : public MediaStreamAudioSink {
   media::AudioParameters params_;
 };
 
+void DisableDefaultAudioProcessingProperties(
+    AudioProcessingProperties* properties) {
+  properties->enable_sw_echo_cancellation = false;
+  properties->goog_experimental_echo_cancellation = false;
+  properties->goog_auto_gain_control = false;
+  properties->goog_experimental_auto_gain_control = false;
+  properties->goog_noise_suppression = false;
+  properties->goog_noise_suppression = false;
+  properties->goog_highpass_filter = false;
+  properties->goog_typing_noise_detection = false;
+  properties->goog_experimental_noise_suppression = false;
+  properties->goog_beamforming = false;
+}
+
 }  // namespace
 
 class ProcessedLocalAudioSourceTest : public testing::Test {
@@ -96,13 +111,13 @@ class ProcessedLocalAudioSourceTest : public testing::Test {
   }
 
   void CreateProcessedLocalAudioSource(
-      const blink::WebMediaConstraints& constraints) {
+      const AudioProcessingProperties& properties) {
     ProcessedLocalAudioSource* const source = new ProcessedLocalAudioSource(
         -1 /* consumer_render_frame_id is N/A for non-browser tests */,
         StreamDeviceInfo(MEDIA_DEVICE_AUDIO_CAPTURE, "Mock audio device",
                          "mock_audio_device_id", kSampleRate, kChannelLayout,
                          kRequestedBufferSize),
-        constraints,
+        properties,
         base::Bind(&ProcessedLocalAudioSourceTest::OnAudioSourceStarted,
                    base::Unretained(this)),
         &mock_dependency_factory_);
@@ -161,11 +176,9 @@ TEST_F(ProcessedLocalAudioSourceTest, VerifyAudioFlowWithoutAudioProcessing) {
 
   // Turn off the default constraints so the sink will get audio in chunks of
   // the native buffer size.
-  MockConstraintFactory constraint_factory;
-  constraint_factory.DisableDefaultAudioConstraints();
-
-  CreateProcessedLocalAudioSource(
-      constraint_factory.CreateWebMediaConstraints());
+  AudioProcessingProperties properties;
+  DisableDefaultAudioProcessingProperties(&properties);
+  CreateProcessedLocalAudioSource(properties);
 
   // Connect the track, and expect the MockCapturerSource to be initialized and
   // started by ProcessedLocalAudioSource.
@@ -206,35 +219,5 @@ TEST_F(ProcessedLocalAudioSourceTest, VerifyAudioFlowWithoutAudioProcessing) {
   MediaStreamAudioTrack::From(blink_audio_track())->Stop();
 }
 
-// Tests that the source is not started when invalid audio constraints are
-// present.
-TEST_F(ProcessedLocalAudioSourceTest, FailToStartWithWrongConstraints) {

[hbos_chromium, 2017/06/16 17:27:14]

Why is this test removed? If invalid constraints are ignored would the
equivalent test be the same as unconstrained? Should't that succeed?

[Guido Urdaneta, 2017/06/19 11:56:49]

The concept of "wrong" constraints does not exist in the new algorithm the way
it existed with the old one.
If you set a width with the new algorithm it will be the same as unconstrained,
so the corresponding test would be the same as the previous one (using default
values for AudioProcessingProperties).
The spec says that unsupported constraints should be ignored.

-  MockConstraintFactory constraint_factory;
-  const std::string dummy_constraint = "dummy";
-  // Set a non-audio constraint.
-  constraint_factory.basic().width.SetExact(240);
-
-  CreateProcessedLocalAudioSource(
-      constraint_factory.CreateWebMediaConstraints());
-
-  // Expect the MockCapturerSource is never initialized/started and the
-  // ConnectToTrack() operation fails due to the invalid constraint.
-  EXPECT_CALL(*mock_audio_device_factory()->mock_capturer_source(),
-              Initialize(_, capture_source_callback(), -1))
-      .Times(0);
-  EXPECT_CALL(*mock_audio_device_factory()->mock_capturer_source(),
-              SetAutomaticGainControl(true)).Times(0);
-  EXPECT_CALL(*mock_audio_device_factory()->mock_capturer_source(), Start())
-      .Times(0);
-  EXPECT_FALSE(audio_source()->ConnectToTrack(blink_audio_track()));
-
-  // Even though ConnectToTrack() failed, there should still have been a new
-  // MediaStreamAudioTrack instance created, owned by the
-  // blink::WebMediaStreamTrack.
-  EXPECT_TRUE(MediaStreamAudioTrack::From(blink_audio_track()));
-}
-
-// TODO(miu): There's a lot of logic in ProcessedLocalAudioSource around
-// constraints processing and validation that should have unit testing.
 
 }  // namespace content