Revert of Introduced new scheme for controlling the functionality inside the audio processing module

webrtc/modules/audio_processing/test/process_test.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 159 matching lines @@
   int samples_per_channel = sample_rate_hz / 100;
 
   bool simulating = false;
   bool perf_testing = false;
   bool verbose = true;
   bool progress = true;
   bool raw_output = false;
   int extra_delay_ms = 0;
   int override_delay_ms = 0;
   Config config;
-  AudioProcessing::Config apm_config;
 
   ASSERT_EQ(apm->kNoError, apm->level_estimator()->Enable(true));
   for (int i = 1; i < argc; i++) {
     if (strcmp(argv[i], "-pb") == 0) {
       i++;
       ASSERT_LT(i, argc) << "Specify protobuf filename after -pb";
       pb_filename = argv[i];
 
     } else if (strcmp(argv[i], "-ir") == 0) {
       i++;
@@ skipping 65 matching lines @@
       i++;
       ASSERT_LT(i, argc) << "Specify level after --aec_suppression_level";
       int suppression_level;
       ASSERT_EQ(1, sscanf(argv[i], "%d", &suppression_level));
       ASSERT_EQ(apm->kNoError,
                 apm->echo_cancellation()->set_suppression_level(
                     static_cast<webrtc::EchoCancellation::SuppressionLevel>(
                         suppression_level)));
 
     } else if (strcmp(argv[i], "--level_control") == 0) {
-      apm_config.level_controller.enabled = true;
+      config.Set<LevelControl>(new LevelControl(true));
+
     } else if (strcmp(argv[i], "--extended_filter") == 0) {
       config.Set<ExtendedFilter>(new ExtendedFilter(true));
 
     } else if (strcmp(argv[i], "--no_reported_delay") == 0) {
       config.Set<DelayAgnostic>(new DelayAgnostic(true));
 
     } else if (strcmp(argv[i], "--delay_agnostic") == 0) {
       config.Set<DelayAgnostic>(new DelayAgnostic(true));
 
     } else if (strcmp(argv[i], "--aec3") == 0) {
@@ skipping 168 matching lines @@
       raw_output = true;
 
     } else if (strcmp(argv[i], "--debug_file") == 0) {
       i++;
       ASSERT_LT(i, argc) << "Specify filename after --debug_file";
       ASSERT_EQ(apm->kNoError, apm->StartDebugRecording(argv[i], -1));
     } else {
       FAIL() << "Unrecognized argument " << argv[i];
     }
   }
-  apm->ApplyConfig(apm_config);
   apm->SetExtraOptions(config);
 
   // If we're reading a protobuf file, ensure a simulation hasn't also
   // been requested (which makes no sense...)
   ASSERT_FALSE(pb_filename && simulating);
 
   if (verbose) {
     printf("Sample rate: %d Hz\n", sample_rate_hz);
     printf("Primary channels: %" PRIuS " (in), %" PRIuS " (out)\n",
            num_capture_input_channels,
@@ skipping 690 matching lines @@
 }  // namespace
 }  // namespace webrtc
 
 int main(int argc, char* argv[]) {
   webrtc::void_main(argc, argv);
 
   // Optional, but removes memory leak noise from Valgrind.
   google::protobuf::ShutdownProtobufLibrary();
   return 0;
 }