| Index: webrtc/modules/audio_processing/test/debug_dump_test.cc
 | 
| diff --git a/webrtc/modules/audio_processing/test/debug_dump_test.cc b/webrtc/modules/audio_processing/test/debug_dump_test.cc
 | 
| index ebf899f82a9401cb8ac42d1f85ff56c31d877452..d67a73e40c71e07e079b17a3fc8f2f44b909688b 100644
 | 
| --- a/webrtc/modules/audio_processing/test/debug_dump_test.cc
 | 
| +++ b/webrtc/modules/audio_processing/test/debug_dump_test.cc
 | 
| @@ -377,11 +377,12 @@ TEST_F(DebugDumpTest, VerifyRefinedAdaptiveFilterExperimentalString) {
 | 
|  
 | 
|  TEST_F(DebugDumpTest, VerifyCombinedExperimentalStringInclusive) {
 | 
|    Config config;
 | 
| +  AudioProcessing::Config apm_config;
 | 
|    config.Set<RefinedAdaptiveFilter>(new RefinedAdaptiveFilter(true));
 | 
| -  config.Set<EchoCanceller3>(new EchoCanceller3(true));
 | 
|    // Arbitrarily set clipping gain to 17, which will never be the default.
 | 
|    config.Set<ExperimentalAgc>(new ExperimentalAgc(true, 0, 17));
 | 
| -  DebugDumpGenerator generator(config, AudioProcessing::Config());
 | 
| +  apm_config.echo_canceller3.enabled = true;
 | 
| +  DebugDumpGenerator generator(config, apm_config);
 | 
|    generator.StartRecording();
 | 
|    generator.Process(100);
 | 
|    generator.StopRecording();
 | 
| @@ -398,7 +399,7 @@ TEST_F(DebugDumpTest, VerifyCombinedExperimentalStringInclusive) {
 | 
|        ASSERT_TRUE(msg->has_experiments_description());
 | 
|        EXPECT_PRED_FORMAT2(testing::IsSubstring, "RefinedAdaptiveFilter",
 | 
|                            msg->experiments_description().c_str());
 | 
| -      EXPECT_PRED_FORMAT2(testing::IsSubstring, "AEC3",
 | 
| +      EXPECT_PRED_FORMAT2(testing::IsSubstring, "EchoCanceller3",
 | 
|                            msg->experiments_description().c_str());
 | 
|        EXPECT_PRED_FORMAT2(testing::IsSubstring, "AgcClippingLevelExperiment",
 | 
|                            msg->experiments_description().c_str());
 | 
| @@ -436,8 +437,9 @@ TEST_F(DebugDumpTest, VerifyCombinedExperimentalStringExclusive) {
 | 
|  
 | 
|  TEST_F(DebugDumpTest, VerifyAec3ExperimentalString) {
 | 
|    Config config;
 | 
| -  config.Set<EchoCanceller3>(new EchoCanceller3(true));
 | 
| -  DebugDumpGenerator generator(config, AudioProcessing::Config());
 | 
| +  AudioProcessing::Config apm_config;
 | 
| +  apm_config.echo_canceller3.enabled = true;
 | 
| +  DebugDumpGenerator generator(config, apm_config);
 | 
|    generator.StartRecording();
 | 
|    generator.Process(100);
 | 
|    generator.StopRecording();
 | 
| @@ -452,7 +454,7 @@ TEST_F(DebugDumpTest, VerifyAec3ExperimentalString) {
 | 
|      if (event->type() == audioproc::Event::CONFIG) {
 | 
|        const audioproc::Config* msg = &event->config();
 | 
|        ASSERT_TRUE(msg->has_experiments_description());
 | 
| -      EXPECT_PRED_FORMAT2(testing::IsSubstring, "AEC3",
 | 
| +      EXPECT_PRED_FORMAT2(testing::IsSubstring, "EchoCanceller3",
 | 
|                            msg->experiments_description().c_str());
 | 
|      }
 | 
|    }
 | 
| 
 |