Remove no-op and unused methods from AudioCodingModule

webrtc/modules/audio_coding/main/test/TestVADDTX.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 119 matching lines @@
         break;
       }
     }
   }
 }
 
 // Following is the implementation of TestWebRtcVadDtx.
 TestWebRtcVadDtx::TestWebRtcVadDtx()
     : vad_enabled_(false),
       dtx_enabled_(false),
-      use_webrtc_dtx_(false),
       output_file_num_(0) {
 }
 
 void TestWebRtcVadDtx::Perform() {
   // Go through various test cases.
 #ifdef WEBRTC_CODEC_ISAC
   // Register iSAC WB as send codec
   RegisterCodec(kIsacWb);
   RunTestCases();
 
@@ skipping 33 matching lines @@
   SetVAD(true, true, VADVeryAggr);
   Test(false);
 
   // #5 DTX = ON, VAD = ON, VADNormal
   SetVAD(true, true, VADNormal);
   Test(false);
 }
 
 // Set the expectation and run the test.
 void TestWebRtcVadDtx::Test(bool new_outfile) {
-  int expects[] = {-1, 1, use_webrtc_dtx_, 0, 0};
+  int expects[] = {-1, 1, dtx_enabled_, 0, 0};
   if (new_outfile) {
     output_file_num_++;
   }
   std::stringstream out_filename;
   out_filename << webrtc::test::OutputPath()
                << "testWebRtcVadDtx_outFile_"
                << output_file_num_
                << ".pcm";
   Run(webrtc::test::ResourcePath("audio_coding/testfile32kHz", "pcm"),
       32000, 1, out_filename.str(), !new_outfile, expects);
 }
 
 void TestWebRtcVadDtx::SetVAD(bool enable_dtx, bool enable_vad,
                               ACMVADMode vad_mode) {
   ACMVADMode mode;
   EXPECT_EQ(0, acm_send_->SetVAD(enable_dtx, enable_vad, vad_mode));
   EXPECT_EQ(0, acm_send_->VAD(&dtx_enabled_, &vad_enabled_, &mode));
 
   CodecInst codec_param;
   acm_send_->SendCodec(&codec_param);
   if (STR_CASE_CMP(codec_param.plname, "opus") == 0) {
     // If send codec is Opus, WebRTC VAD/DTX cannot be used.
     enable_dtx = enable_vad = false;
   }
 
   EXPECT_EQ(dtx_enabled_ , enable_dtx); // DTX should be set as expected.
 
-  bool replaced = false;
-  acm_send_->IsInternalDTXReplacedWithWebRtc(&replaced);
-
-  use_webrtc_dtx_ = dtx_enabled_ && replaced;
-
-  if (use_webrtc_dtx_) {
+  if (dtx_enabled_) {
     EXPECT_TRUE(vad_enabled_); // WebRTC DTX cannot run without WebRTC VAD.
-  }
-
-  if (!dtx_enabled_ || !use_webrtc_dtx_) {
-    // Using no DTX or codec Internal DTX should not affect setting of VAD.
+  } else {
+    // Using no DTX should not affect setting of VAD.
     EXPECT_EQ(enable_vad, vad_enabled_);
   }
 }
 
 // Following is the implementation of TestOpusDtx.
 void TestOpusDtx::Perform() {
 #ifdef WEBRTC_CODEC_ISAC
   // If we set other codec than Opus, DTX cannot be toggled.
   RegisterCodec(kIsacWb);
   EXPECT_EQ(-1, acm_send_->EnableOpusDtx());
@@ skipping 27 matching lines @@
 
   EXPECT_EQ(0, acm_send_->EnableOpusDtx());
 
   expects[kFrameEmpty] = 1;
   Run(webrtc::test::ResourcePath("audio_coding/teststereo32kHz", "pcm"),
       32000, 2, out_filename, true, expects);
 #endif
 }
 
 }  // namespace webrtc