AEC3: Remove deprecated command line switches

This CL removes command line switches for experimental features in AEC3
that now are deprecated.

This CL also replaces the outdated CL
(https://chromium-review.googlesource.com/c/chromium/src/+/1274905)

Bug: webrtc:8671
Change-Id: I83582049ab8c144ff8654107e928e8e75fd1f4e0
Reviewed-on: https://chromium-review.googlesource.com/c/1350752Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Commit-Queue: Per Åhgren <peah@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611029}

content/renderer/media/stream/media_stream_audio_processor.cc

@@ -613,12 +613,6 @@ void MediaStreamAudioProcessor::InitializeAudioProcessingModule(
           webrtc::EchoCanceller3Config::Validate(&aec3_config);
       RTC_DCHECK(config_parameters_already_valid);
     }
-    aec3_config.ep_strength.bounded_erl |=
-        base::FeatureList::IsEnabled(features::kWebRtcAecBoundedErlSetup);
-    aec3_config.echo_removal_control.has_clock_drift |=
-        base::FeatureList::IsEnabled(features::kWebRtcAecClockDriftSetup);
-    aec3_config.echo_audibility.use_stationary_properties |=
-        base::FeatureList::IsEnabled(features::kWebRtcAecNoiseTransparency);
 
     ap_builder.SetEchoControlFactory(
         std::unique_ptr<webrtc::EchoControlFactory>(

media/webrtc/audio_processor.cc

@@ -222,16 +222,8 @@ void AudioProcessor::InitializeAPM() {
   // Echo cancellation is configured both before and after AudioProcessing
   // construction, but before Initialize.
   if (settings_.echo_cancellation == EchoCancellationType::kAec3) {
-    webrtc::EchoCanceller3Config aec3_config;
-    aec3_config.ep_strength.bounded_erl =
-        base::FeatureList::IsEnabled(features::kWebRtcAecBoundedErlSetup);
-    aec3_config.echo_removal_control.has_clock_drift =
-        base::FeatureList::IsEnabled(features::kWebRtcAecClockDriftSetup);
-    aec3_config.echo_audibility.use_stationary_properties =
-        base::FeatureList::IsEnabled(features::kWebRtcAecNoiseTransparency);
-
     ap_builder.SetEchoControlFactory(
-        std::make_unique<webrtc::EchoCanceller3Factory>(aec3_config));
+        std::make_unique<webrtc::EchoCanceller3Factory>());
   }
 
   // AGC setup part 1.

media/webrtc/webrtc_switches.cc

@@ -25,21 +25,6 @@ const char kAgcStartupMinVolume[] = "agc-startup-min-volume";
 
 namespace features {
 
-// Informs the WebRTC Acoustic Echo Canceler (AEC) that echo path loss is
-// bounded.
-const base::Feature kWebRtcAecBoundedErlSetup{
-    "WebRtcAecBoundedErlSetup", base::FEATURE_DISABLED_BY_DEFAULT};
-
-// Informs the WebRTC Acoustic Echo Canceler (AEC) that the playout and
-// capture is done using different clocks.
-const base::Feature kWebRtcAecClockDriftSetup{
-    "WebRtcAecClockDriftSetup", base::FEATURE_DISABLED_BY_DEFAULT};
-
-// Informs the WebRTC Acoustic Echo Canceler (AEC) that the feature providing
-// echo canceller transparency to render noise should be used.
-const base::Feature kWebRtcAecNoiseTransparency{
-    "WebRtcAecNoiseTransparency", base::FEATURE_DISABLED_BY_DEFAULT};
-
 // Enables running WebRTC Audio Processing in the audio service, rather than
 // in the renderer process. Should be combined with running the audio service
 // out of the browser process, except for when testing locally.

media/webrtc/webrtc_switches.h

@@ -19,12 +19,6 @@ COMPONENT_EXPORT(MEDIA_WEBRTC) extern const char kAgcStartupMinVolume[];
 
 namespace features {
 
-COMPONENT_EXPORT(MEDIA_WEBRTC)
-extern const base::Feature kWebRtcAecBoundedErlSetup;
-COMPONENT_EXPORT(MEDIA_WEBRTC)
-extern const base::Feature kWebRtcAecClockDriftSetup;
-COMPONENT_EXPORT(MEDIA_WEBRTC)
-extern const base::Feature kWebRtcAecNoiseTransparency;
 COMPONENT_EXPORT(MEDIA_WEBRTC)
 extern const base::Feature kWebRtcApmInAudioService;
 COMPONENT_EXPORT(MEDIA_WEBRTC)