Make naming of APM perf test consistent

webrtc/modules/audio_processing/audio_processing_performance_unittest.cc

 /*
  *  Copyright (c) 2015 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.
  */
 #include "webrtc/modules/audio_processing/audio_processing_impl.h"
@@ skipping 29 matching lines @@
 // Type of the render thread APM API call to use in the test.
 enum class ProcessorType { kRender, kCapture };
 
 // Variant of APM processing settings to use in the test.
 enum class SettingsType {
   kDefaultApmDesktop,
   kDefaultApmMobile,
   kDefaultApmDesktopAndBeamformer,
   kDefaultApmDesktopAndIntelligibilityEnhancer,
   kAllSubmodulesTurnedOff,
-  kDefaultDesktopApmWithoutDelayAgnostic,
-  kDefaultDesktopApmWithoutExtendedFilter
+  kDefaultApmDesktopWithoutDelayAgnostic,
+  kDefaultApmDesktopWithoutExtendedFilter
 };
 
 // Variables related to the audio data and formats.
 struct AudioFrameData {
   explicit AudioFrameData(size_t max_frame_size) {
     // Set up the two-dimensional arrays needed for the APM API calls.
     input_framechannels.resize(2 * max_frame_size);
     input_frame.resize(2);
     input_frame[0] = &input_framechannels[0];
     input_frame[1] = &input_framechannels[max_frame_size];
@@ skipping 16 matching lines @@
 struct SimulationConfig {
   SimulationConfig(int sample_rate_hz, SettingsType simulation_settings)
       : sample_rate_hz(sample_rate_hz),
         simulation_settings(simulation_settings) {}
 
   static std::vector<SimulationConfig> GenerateSimulationConfigs() {
     std::vector<SimulationConfig> simulation_configs;
 #ifndef WEBRTC_ANDROID
     const SettingsType desktop_settings[] = {
         SettingsType::kDefaultApmDesktop, SettingsType::kAllSubmodulesTurnedOff,
-        SettingsType::kDefaultDesktopApmWithoutDelayAgnostic,
-        SettingsType::kDefaultDesktopApmWithoutExtendedFilter};
+        SettingsType::kDefaultApmDesktopWithoutDelayAgnostic,
+        SettingsType::kDefaultApmDesktopWithoutExtendedFilter};
 
     const int desktop_sample_rates[] = {8000, 16000, 32000, 48000};
 
     for (auto sample_rate : desktop_sample_rates) {
       for (auto settings : desktop_settings) {
         simulation_configs.push_back(SimulationConfig(sample_rate, settings));
       }
     }
 
     const SettingsType intelligibility_enhancer_settings[] = {
@@ skipping 44 matching lines @@
         break;
       case SettingsType::kDefaultApmDesktopAndBeamformer:
         description = "DefaultApmDesktopAndBeamformer";
         break;
       case SettingsType::kDefaultApmDesktopAndIntelligibilityEnhancer:
         description = "DefaultApmDesktopAndIntelligibilityEnhancer";
         break;
       case SettingsType::kAllSubmodulesTurnedOff:
         description = "AllSubmodulesOff";
         break;
-      case SettingsType::kDefaultDesktopApmWithoutDelayAgnostic:
-        description = "DefaultDesktopApmWithoutDelayAgnostic";
+      case SettingsType::kDefaultApmDesktopWithoutDelayAgnostic:
+        description = "DefaultApmDesktopWithoutDelayAgnostic";
         break;
-      case SettingsType::kDefaultDesktopApmWithoutExtendedFilter:
-        description = "DefaultDesktopApmWithoutExtendedFilter";
+      case SettingsType::kDefaultApmDesktopWithoutExtendedFilter:
+        description = "DefaultApmDesktopWithoutExtendedFilter";
         break;
     }
     return description;
   }
 
   int sample_rate_hz = 16000;
   SettingsType simulation_settings = SettingsType::kDefaultApmDesktop;
 };
 
 // Handler for the frame counters.
@@ skipping 429 matching lines @@
         set_default_desktop_apm_runtime_settings(apm_.get());
         apm_->SetExtraOptions(config);
         break;
       }
       case SettingsType::kAllSubmodulesTurnedOff: {
         apm_.reset(AudioProcessingImpl::Create());
         ASSERT_TRUE(!!apm_);
         turn_off_default_apm_runtime_settings(apm_.get());
         break;
       }
-      case SettingsType::kDefaultDesktopApmWithoutDelayAgnostic: {
+      case SettingsType::kDefaultApmDesktopWithoutDelayAgnostic: {
         Config config;
         config.Set<ExtendedFilter>(new ExtendedFilter(true));
         config.Set<DelayAgnostic>(new DelayAgnostic(false));
         apm_.reset(AudioProcessingImpl::Create(config));
         ASSERT_TRUE(!!apm_);
         set_default_desktop_apm_runtime_settings(apm_.get());
         apm_->SetExtraOptions(config);
         break;
       }
-      case SettingsType::kDefaultDesktopApmWithoutExtendedFilter: {
+      case SettingsType::kDefaultApmDesktopWithoutExtendedFilter: {
         Config config;
         config.Set<ExtendedFilter>(new ExtendedFilter(false));
         config.Set<DelayAgnostic>(new DelayAgnostic(true));
         apm_.reset(AudioProcessingImpl::Create(config));
         ASSERT_TRUE(!!apm_);
         set_default_desktop_apm_runtime_settings(apm_.get());
         apm_->SetExtraOptions(config);
         break;
       }
     }
@@ skipping 79 matching lines @@
   // Run test and verify that it did not time out.
   EXPECT_EQ(kEventSignaled, Run());
 }
 
 INSTANTIATE_TEST_CASE_P(
     AudioProcessingPerformanceTest,
     CallSimulator,
     ::testing::ValuesIn(SimulationConfig::GenerateSimulationConfigs()));
 
 }  // namespace webrtc