Remove API-related #defines from voice_engine_configurations.h

webrtc/voice_engine/test/auto_test/voe_standard_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.
  */
 
 #include "webrtc/voice_engine/test/auto_test/voe_standard_test.h"
 
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "webrtc/system_wrappers/include/event_wrapper.h"
 #include "webrtc/voice_engine/include/voe_neteq_stats.h"
 #include "webrtc/voice_engine/test/auto_test/automated_mode.h"
 #include "webrtc/voice_engine/test/auto_test/voe_cpu_test.h"
 #include "webrtc/voice_engine/test/auto_test/voe_stress_test.h"
 #include "webrtc/voice_engine/test/auto_test/voe_test_defines.h"
 #include "webrtc/voice_engine/voice_engine_defines.h"
 #include "webrtc/voice_engine_configurations.h"
 
-#ifndef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API
-#error "Deprecated"
-#endif
-
 DEFINE_bool(include_timing_dependent_tests, true,
             "If true, we will include tests / parts of tests that are known "
             "to break in slow execution environments (such as valgrind).");
 DEFINE_bool(automated, false,
             "If true, we'll run the automated tests we have in noninteractive "
             "mode.");
 
 using namespace webrtc;
 
 namespace voetest {
@@ skipping 53 matching lines @@
 
 VoETestManager::VoETestManager()
     : initialized_(false),
       voice_engine_(NULL),
       voe_base_(0),
       voe_codec_(0),
       voe_xmedia_(0),
       voe_file_(0),
       voe_hardware_(0),
       voe_network_(0),
-#ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API
       voe_neteq_stats_(NULL),
-#endif
       voe_rtp_rtcp_(0),
       voe_vsync_(0),
       voe_volume_control_(0),
       voe_apm_(0) {
 }
 
 VoETestManager::~VoETestManager() {
 }
 
 bool VoETestManager::Init() {
@@ skipping 29 matching lines @@
         printf("\nERROR: failed to set audio layer to use in "
           "testing\n");
       } else {
         printf("\nAudio layer %d will be used in testing\n",
                TESTED_AUDIO_LAYER);
       }
     }
 #ifdef _TEST_XMEDIA_
     voe_xmedia_ = VoEExternalMedia::GetInterface(voice_engine_);
 #endif
-#ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API
     voe_neteq_stats_ = VoENetEqStats::GetInterface(voice_engine_);
-#endif
   }
 }
 
 int VoETestManager::ReleaseInterfaces() {
   bool releaseOK(true);
 
   if (voe_base_) {
     voe_base_->Release();
     voe_base_ = NULL;
   }
@@ skipping 30 matching lines @@
   if (voe_hardware_) {
     voe_hardware_->Release();
     voe_hardware_ = NULL;
   }
 #ifdef _TEST_XMEDIA_
   if (voe_xmedia_) {
     voe_xmedia_->Release();
     voe_xmedia_ = NULL;
   }
 #endif
-#ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API
   if (voe_neteq_stats_) {
     voe_neteq_stats_->Release();
     voe_neteq_stats_ = NULL;
   }
-#endif
   if (false == VoiceEngine::Delete(voice_engine_)) {
     TEST_LOG("\n\nVoiceEngine::Delete() failed. \n");
     releaseOK = false;
   }
 
   return (releaseOK == true) ? 0 : -1;
 }
 
 int run_auto_test(TestType test_type) {
   assert(test_type != Standard);
@@ skipping 103 matching lines @@
   google::AllowCommandLineReparsing();
   google::ParseCommandLineFlags(&argc, &argv, true);
 
   if (FLAGS_automated) {
     return RunInAutomatedMode();
   }
 
   return RunInManualMode();
 }
 #endif //#if !defined(WEBRTC_IOS)