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

webrtc/tools/agc/activity_metric.cc

Index: webrtc/tools/agc/activity_metric.cc
diff --git a/webrtc/tools/agc/activity_metric.cc b/webrtc/tools/agc/activity_metric.cc
index fb50daf2baff1120dfcbcb362f5fcbcf8f96b2d4..57e2ad615ff8ba5da33ed2c8ec469b5045bcd11b 100644
--- a/webrtc/tools/agc/activity_metric.cc
+++ b/webrtc/tools/agc/activity_metric.cc
@@ -18,12 +18,12 @@
 #include "gflags/gflags.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/modules/audio_processing/agc/agc.h"
+#include "webrtc/modules/audio_processing/agc/agc_audio_proc.h"
+#include "webrtc/modules/audio_processing/agc/common.h"
 #include "webrtc/modules/audio_processing/agc/histogram.h"
+#include "webrtc/modules/audio_processing/agc/pitch_based_vad.h"
+#include "webrtc/modules/audio_processing/agc/standalone_vad.h"
 #include "webrtc/modules/audio_processing/agc/utility.h"
-#include "webrtc/modules/audio_processing/vad/vad_audio_proc.h"
-#include "webrtc/modules/audio_processing/vad/common.h"
-#include "webrtc/modules/audio_processing/vad/pitch_based_vad.h"
-#include "webrtc/modules/audio_processing/vad/standalone_vad.h"
 #include "webrtc/modules/interface/module_common_types.h"
 
 static const int kAgcAnalWindowSamples = 100;
@@ -75,7 +75,7 @@ class AgcStat {
       : video_index_(0),
         activity_threshold_(kDefaultActivityThreshold),
         audio_content_(Histogram::Create(kAgcAnalWindowSamples)),
-        audio_processing_(new VadAudioProc()),
+        audio_processing_(new AgcAudioProc()),
         vad_(new PitchBasedVad()),
         standalone_vad_(StandaloneVad::Create()),
         audio_content_fid_(NULL) {
@@ -155,7 +155,7 @@ class AgcStat {
   double activity_threshold_;
   double video_vad_[kMaxNumFrames];
   rtc::scoped_ptr<Histogram> audio_content_;
-  rtc::scoped_ptr<VadAudioProc> audio_processing_;
+  rtc::scoped_ptr<AgcAudioProc> audio_processing_;
   rtc::scoped_ptr<PitchBasedVad> vad_;
   rtc::scoped_ptr<StandaloneVad> standalone_vad_;