Revert "Pull the Voice Activity Detector out from the AGC"

webrtc/modules/audio_processing/agc/agc_audio_proc_unittest.cc

Index: webrtc/modules/audio_processing/agc/agc_audio_proc_unittest.cc
diff --git a/webrtc/modules/audio_processing/vad/vad_audio_proc_unittest.cc b/webrtc/modules/audio_processing/agc/agc_audio_proc_unittest.cc
similarity index 88%
rename from webrtc/modules/audio_processing/vad/vad_audio_proc_unittest.cc
rename to webrtc/modules/audio_processing/agc/agc_audio_proc_unittest.cc
index 675af70b4575fbc17508375f37b8ba5e0c79db4c..9534aec2ec3ea0284bdd9786bc920f22a773337f 100644
--- a/webrtc/modules/audio_processing/vad/vad_audio_proc_unittest.cc
+++ b/webrtc/modules/audio_processing/agc/agc_audio_proc_unittest.cc
@@ -12,22 +12,20 @@
 // routines. However, interpolation of pitch-gain and lags is in a separate
 // class and has its own unit-test.
 
-#include "webrtc/modules/audio_processing/vad/vad_audio_proc.h"
+#include "webrtc/modules/audio_processing/agc/agc_audio_proc.h"
 
 #include <math.h>
 #include <stdio.h>
 
-#include <string>
-
-#include "testing/gtest/include/gtest/gtest.h"
-#include "webrtc/modules/audio_processing/vad/common.h"
+#include "gtest/gtest.h"
+#include "webrtc/modules/audio_processing/agc/common.h"
 #include "webrtc/modules/interface/module_common_types.h"
 #include "webrtc/test/testsupport/fileutils.h"
 
 namespace webrtc {
 
 TEST(AudioProcessingTest, DISABLED_ComputingFirstSpectralPeak) {
-  VadAudioProc audioproc;
+  AgcAudioProc audioproc;
 
   std::string peak_file_name =
       test::ResourcePath("audio_processing/agc/agc_spectral_peak", "dat");
@@ -41,7 +39,7 @@ TEST(AudioProcessingTest, DISABLED_ComputingFirstSpectralPeak) {
 
   // Read 10 ms audio in each iteration.
   const size_t kDataLength = kLength10Ms;
-  int16_t data[kDataLength] = {0};
+  int16_t data[kDataLength] = { 0 };
   AudioFeatures features;
   double sp[kMaxNumFrames];
   while (fread(data, sizeof(int16_t), kDataLength, pcm_file) == kDataLength) {