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

webrtc/modules/audio_processing/agc/agc_audio_proc.h

Index: webrtc/modules/audio_processing/agc/agc_audio_proc.h
diff --git a/webrtc/modules/audio_processing/vad/vad_audio_proc.h b/webrtc/modules/audio_processing/agc/agc_audio_proc.h
similarity index 87%
rename from webrtc/modules/audio_processing/vad/vad_audio_proc.h
rename to webrtc/modules/audio_processing/agc/agc_audio_proc.h
index 6cf3937f79f6e290af482625665ebe8fbbb23179..e5eb39017098e9208e31f7a16c83985253213c68 100644
--- a/webrtc/modules/audio_processing/vad/vad_audio_proc.h
+++ b/webrtc/modules/audio_processing/agc/agc_audio_proc.h
@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROC_H_
-#define WEBRTC_MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROC_H_
+#ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AGC_AGC_AUDIO_PROC_H_
+#define WEBRTC_MODULES_AUDIO_PROCESSING_AGC_AGC_AUDIO_PROC_H_
 
 #include "webrtc/base/scoped_ptr.h"
-#include "webrtc/modules/audio_processing/vad/common.h"
+#include "webrtc/modules/audio_processing/agc/common.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -20,14 +20,14 @@ namespace webrtc {
 class AudioFrame;
 class PoleZeroFilter;
 
-class VadAudioProc {
+class AgcAudioProc {
  public:
   // Forward declare iSAC structs.
   struct PitchAnalysisStruct;
   struct PreFiltBankstr;
 
-  VadAudioProc();
-  ~VadAudioProc();
+  AgcAudioProc();
+  ~AgcAudioProc();
 
   int ExtractFeatures(const int16_t* audio_frame,
                       int length,
@@ -55,8 +55,7 @@ class VadAudioProc {
 
   static const int kNum10msSubframes = 3;
   static const int kNumSubframeSamples = kSampleRateHz / 100;
-  static const int kNumSamplesToProcess =
-      kNum10msSubframes *
+  static const int kNumSamplesToProcess = kNum10msSubframes *
       kNumSubframeSamples;  // Samples in 30 ms @ given sampling rate.
   static const int kBufferLength = kNumPastSignalSamples + kNumSamplesToProcess;
   static const int kIpLength = kDftSize >> 1;
@@ -81,4 +80,4 @@ class VadAudioProc {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_AUDIO_PROCESSING_VAD_VAD_AUDIO_PROC_H_
+#endif  // WEBRTC_MODULES_AUDIO_PROCESSING_AGC_AGC_AUDIO_PROC_H_