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

webrtc/modules/audio_processing/agc/standalone_vad_unittest.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/modules/audio_processing/vad/standalone_vad.h"
+#include "webrtc/modules/audio_processing/agc/standalone_vad.h"
 
 #include <string.h>
 
-#include "testing/gtest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/modules/interface/module_common_types.h"
 #include "webrtc/test/testsupport/fileutils.h"
 #include "webrtc/test/testsupport/gtest_disable.h"
 
 namespace webrtc {
 
 TEST(StandaloneVadTest, Api) {
   rtc::scoped_ptr<StandaloneVad> vad(StandaloneVad::Create());
-  int16_t data[kLength10Ms] = {0};
+  int16_t data[kLength10Ms] = { 0 };
 
   // Valid frame length (for 32 kHz rate), but not what the VAD is expecting.
   EXPECT_EQ(-1, vad->AddAudio(data, 320));
 
   const int kMaxNumFrames = 3;
   double p[kMaxNumFrames];
   for (int n = 0; n < kMaxNumFrames; n++)
     EXPECT_EQ(0, vad->AddAudio(data, kLength10Ms));
 
   // Pretend |p| is shorter that it should be.
@@ skipping 15 matching lines @@
 
   // Valid mode.
   const int kMode = 2;
   EXPECT_EQ(0, vad->set_mode(kMode));
   EXPECT_EQ(kMode, vad->mode());
 }
 
 TEST(StandaloneVadTest, DISABLED_ON_IOS(ActivityDetection)) {
   rtc::scoped_ptr<StandaloneVad> vad(StandaloneVad::Create());
   const size_t kDataLength = kLength10Ms;
-  int16_t data[kDataLength] = {0};
+  int16_t data[kDataLength] = { 0 };
 
   FILE* pcm_file =
       fopen(test::ResourcePath("audio_processing/agc/agc_audio", "pcm").c_str(),
             "rb");
   ASSERT_TRUE(pcm_file != NULL);
 
   FILE* reference_file = fopen(
       test::ResourcePath("audio_processing/agc/agc_vad", "dat").c_str(), "rb");
   ASSERT_TRUE(reference_file != NULL);
 
@@ skipping 22 matching lines @@
       } else {
         // When inactive, probabilities are set to 0.01.
         for (int n = 0; n < kNumVadFramesToProcess; n++)
           EXPECT_EQ(0.01, p[n]);
       }
     }
   }
   fclose(reference_file);
   fclose(pcm_file);
 }
-}  // namespace webrtc
+}