Include files from webrtc/.. paths in voice_engine/

BUG=1662
R=henrikg@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1434005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4079 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/voice_engine/channel.h

@@ -28,7 +28,8 @@
 #include "webrtc/voice_engine/voice_engine_defines.h"
 
 #ifdef WEBRTC_DTMF_DETECTION
-#include "voe_dtmf.h" // TelephoneEventDetectionMethods, TelephoneEventObserver
+// TelephoneEventDetectionMethods, TelephoneEventObserver
+#include "webrtc/voice_engine/include/voe_dtmf.h"
 #endif
 
 namespace webrtc

webrtc/voice_engine/channel_manager.cc

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "channel.h"
-#include "channel_manager.h"
+#include "webrtc/voice_engine/channel.h"
+#include "webrtc/voice_engine/channel_manager.h"
 
 namespace webrtc
 {

webrtc/voice_engine/channel_manager.h

@@ -11,8 +11,8 @@
 #ifndef WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H
 #define WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_H
 
-#include "channel_manager_base.h"
-#include "typedefs.h"
+#include "webrtc/typedefs.h"
+#include "webrtc/voice_engine/channel_manager_base.h"
 
 namespace webrtc
 {

webrtc/voice_engine/channel_manager_base.cc

@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "channel_manager_base.h"
+#include "webrtc/voice_engine/channel_manager_base.h"
 
-#include "critical_section_wrapper.h"
-#include "rw_lock_wrapper.h"
 #include <cassert>
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/rw_lock_wrapper.h"
 
 namespace webrtc
 {

webrtc/voice_engine/channel_manager_base.h

@@ -11,9 +11,9 @@
 #ifndef WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_BASE_H
 #define WEBRTC_VOICE_ENGINE_CHANNEL_MANAGER_BASE_H
 
-#include "typedefs.h"
-#include "map_wrapper.h"
-#include "voice_engine_defines.h"
+#include "webrtc/system_wrappers/interface/map_wrapper.h"
+#include "webrtc/typedefs.h"
+#include "webrtc/voice_engine/voice_engine_defines.h"
 
 namespace webrtc
 {

webrtc/voice_engine/channel_unittest.cc

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "channel.h"
-#include "gtest/gtest.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/voice_engine/channel.h"
 
 // Empty test just to get coverage metrics.
 TEST(ChannelTest, EmptyTestToGetCodeCoverage) {}

webrtc/voice_engine/dtmf_inband.cc

@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "dtmf_inband.h"
+#include "webrtc/voice_engine/dtmf_inband.h"
 
-#include "critical_section_wrapper.h"
-#include "trace.h"
 #include <cassert>
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 namespace webrtc {
 

webrtc/voice_engine/dtmf_inband.h

@@ -15,8 +15,8 @@
 #pragma once
 #endif
 
-#include "typedefs.h"
-#include "voice_engine_defines.h"
+#include "webrtc/typedefs.h"
+#include "webrtc/voice_engine/voice_engine_defines.h"
 
 namespace webrtc {
 class CriticalSectionWrapper;

webrtc/voice_engine/dtmf_inband_queue.cc

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "dtmf_inband_queue.h"
-#include "trace.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/voice_engine/dtmf_inband_queue.h"
 
 namespace webrtc {
 

webrtc/voice_engine/dtmf_inband_queue.h

@@ -11,9 +11,9 @@
 #ifndef WEBRTC_VOICE_ENGINE_DTMF_INBAND_QUEUE_H
 #define WEBRTC_VOICE_ENGINE_DTMF_INBAND_QUEUE_H
 
-#include "critical_section_wrapper.h"
-#include "typedefs.h"
-#include "voice_engine_defines.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/typedefs.h"
+#include "webrtc/voice_engine/voice_engine_defines.h"
 
 
 namespace webrtc {

webrtc/voice_engine/include/mock/mock_voe_connection_observer.h

@@ -11,7 +11,7 @@
 #ifndef MOCK_VOE_CONNECTION_OBSERVER_H_
 #define MOCK_VOE_CONNECTION_OBSERVER_H_
 
-#include "voice_engine/include/voe_network.h"
+#include "webrtc/voice_engine/include/voe_network.h"
 
 #include "testing/gmock/include/gmock/gmock.h"
 

webrtc/voice_engine/include/mock/mock_voe_observer.h

@@ -11,8 +11,8 @@
 #ifndef WEBRTC_VOICE_ENGINE_MOCK_VOE_OBSERVER_H_
 #define WEBRTC_VOICE_ENGINE_MOCK_VOE_OBSERVER_H_
 
-#include "gmock/gmock.h"
-#include "voice_engine/include/voe_base.h"
+#include "testing/gmock/include/gmock/gmock.h"
+#include "webrtc/voice_engine/include/voe_base.h"
 
 namespace webrtc {
 

webrtc/voice_engine/include/voe_audio_processing.h

@@ -35,7 +35,7 @@
 #ifndef WEBRTC_VOICE_ENGINE_VOE_AUDIO_PROCESSING_H
 #define WEBRTC_VOICE_ENGINE_VOE_AUDIO_PROCESSING_H
 
-#include "common_types.h"
+#include "webrtc/common_types.h"
 
 namespace webrtc {
 

webrtc/voice_engine/include/voe_base.h

@@ -34,7 +34,7 @@
 #ifndef WEBRTC_VOICE_ENGINE_VOE_BASE_H
 #define WEBRTC_VOICE_ENGINE_VOE_BASE_H
 
-#include "common_types.h"
+#include "webrtc/common_types.h"
 
 namespace webrtc {
 

webrtc/voice_engine/include/voe_call_report.h

@@ -34,7 +34,7 @@
 #ifndef WEBRTC_VOICE_ENGINE_VOE_CALL_REPORT_H
 #define WEBRTC_VOICE_ENGINE_VOE_CALL_REPORT_H
 
-#include "common_types.h"
+#include "webrtc/common_types.h"
 
 namespace webrtc {
 

webrtc/voice_engine/include/voe_codec.h

@@ -31,7 +31,7 @@
 #ifndef WEBRTC_VOICE_ENGINE_VOE_CODEC_H
 #define WEBRTC_VOICE_ENGINE_VOE_CODEC_H
 
-#include "common_types.h"
+#include "webrtc/common_types.h"
 
 namespace webrtc {
 

webrtc/voice_engine/include/voe_encryption.h

@@ -24,7 +24,7 @@
 #ifndef WEBRTC_VOICE_ENGINE_VOE_ENCRYPTION_H
 #define WEBRTC_VOICE_ENGINE_VOE_ENCRYPTION_H
 
-#include "common_types.h"
+#include "webrtc/common_types.h"
 
 namespace webrtc {
 

webrtc/voice_engine/include/voe_external_media.h

@@ -32,7 +32,7 @@
 #ifndef WEBRTC_VOICE_ENGINE_VOE_EXTERNAL_MEDIA_H
 #define WEBRTC_VOICE_ENGINE_VOE_EXTERNAL_MEDIA_H
 
-#include "common_types.h"
+#include "webrtc/common_types.h"
 
 namespace webrtc {
 

webrtc/voice_engine/include/voe_file.h

@@ -38,7 +38,7 @@
 #ifndef WEBRTC_VOICE_ENGINE_VOE_FILE_H
 #define WEBRTC_VOICE_ENGINE_VOE_FILE_H
 
-#include "common_types.h"
+#include "webrtc/common_types.h"
 
 namespace webrtc {
 

webrtc/voice_engine/include/voe_hardware.h

@@ -32,7 +32,7 @@
 #ifndef WEBRTC_VOICE_ENGINE_VOE_HARDWARE_H
 #define WEBRTC_VOICE_ENGINE_VOE_HARDWARE_H
 
-#include "common_types.h"
+#include "webrtc/common_types.h"
 
 namespace webrtc {
 

webrtc/voice_engine/include/voe_neteq_stats.h

@@ -11,7 +11,7 @@
 #ifndef WEBRTC_VOICE_ENGINE_VOE_NETEQ_STATS_H
 #define WEBRTC_VOICE_ENGINE_VOE_NETEQ_STATS_H
 
-#include "common_types.h"
+#include "webrtc/common_types.h"
 
 namespace webrtc {
 

webrtc/voice_engine/include/voe_network.h

@@ -34,7 +34,7 @@
 #ifndef WEBRTC_VOICE_ENGINE_VOE_NETWORK_H
 #define WEBRTC_VOICE_ENGINE_VOE_NETWORK_H
 
-#include "common_types.h"
+#include "webrtc/common_types.h"
 
 namespace webrtc {
 

webrtc/voice_engine/include/voe_rtp_rtcp.h

@@ -41,7 +41,7 @@
 #define WEBRTC_VOICE_ENGINE_VOE_RTP_RTCP_H
 
 #include <vector>
-#include "common_types.h"
+#include "webrtc/common_types.h"
 
 namespace webrtc {
 

webrtc/voice_engine/include/voe_volume_control.h

@@ -36,7 +36,7 @@
 #ifndef WEBRTC_VOICE_ENGINE_VOE_VOLUME_CONTROL_H
 #define WEBRTC_VOICE_ENGINE_VOE_VOLUME_CONTROL_H
 
-#include "common_types.h"
+#include "webrtc/common_types.h"
 
 namespace webrtc {
 

webrtc/voice_engine/level_indicator.cc

@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "critical_section_wrapper.h"
-#include "level_indicator.h"
-#include "module_common_types.h"
-#include "signal_processing_library.h"
+#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/voice_engine/level_indicator.h"
 
 namespace webrtc {
 

webrtc/voice_engine/level_indicator.h

@@ -11,8 +11,8 @@
 #ifndef WEBRTC_VOICE_ENGINE_LEVEL_INDICATOR_H
 #define WEBRTC_VOICE_ENGINE_LEVEL_INDICATOR_H
 
-#include "typedefs.h"
-#include "voice_engine_defines.h"
+#include "webrtc/typedefs.h"
+#include "webrtc/voice_engine/voice_engine_defines.h"
 
 namespace webrtc {
 

webrtc/voice_engine/monitor_module.h

@@ -11,9 +11,9 @@
 #ifndef WEBRTC_VOICE_ENGINE_MONITOR_MODULE_H
 #define WEBRTC_VOICE_ENGINE_MONITOR_MODULE_H
 
-#include "module.h"
-#include "typedefs.h"
-#include "voice_engine_defines.h"
+#include "webrtc/modules/interface/module.h"
+#include "webrtc/typedefs.h"
+#include "webrtc/voice_engine/voice_engine_defines.h"
 
 class MonitorObserver
 {

webrtc/voice_engine/shared_data.cc

@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "shared_data.h"
+#include "webrtc/voice_engine/shared_data.h"
 
-#include "audio_processing.h"
-#include "critical_section_wrapper.h"
-#include "channel.h"
-#include "output_mixer.h"
-#include "trace.h"
-#include "transmit_mixer.h"
+#include "webrtc/modules/audio_processing/include/audio_processing.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/voice_engine/channel.h"
+#include "webrtc/voice_engine/output_mixer.h"
+#include "webrtc/voice_engine/transmit_mixer.h"
 
 namespace webrtc {
 

webrtc/voice_engine/statistics.cc

@@ -11,10 +11,10 @@
 #include <cassert>
 #include <stdio.h>
 
-#include "statistics.h"
+#include "webrtc/voice_engine/statistics.h"
 
-#include "trace.h"
-#include "critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 namespace webrtc {
 

webrtc/voice_engine/statistics.h

@@ -11,10 +11,10 @@
 #ifndef WEBRTC_VOICE_ENGINE_STATISTICS_H
 #define WEBRTC_VOICE_ENGINE_STATISTICS_H
 
-#include "common_types.h"
-#include "typedefs.h"
-#include "voice_engine_defines.h"
-#include "voe_errors.h"
+#include "webrtc/common_types.h"
+#include "webrtc/typedefs.h"
+#include "webrtc/voice_engine/include/voe_errors.h"
+#include "webrtc/voice_engine/voice_engine_defines.h"
 
 namespace webrtc {
 class CriticalSectionWrapper;

webrtc/voice_engine/test/android/android_test/jni/android_test.cc

@@ -8,26 +8,26 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include <android/log.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
-#include <android/log.h>
 
-#include "org_webrtc_voiceengine_test_AndroidTest.h"
+#include "webrtc/voice_engine/test/android/android_test/jni/org_webrtc_voiceengine_test_AndroidTest.h"
 
-#include "thread_wrapper.h"
+#include "webrtc/system_wrappers/interface/thread_wrapper.h"
 
-#include "voe_base.h"
-#include "voe_codec.h"
-#include "voe_file.h"
-#include "voe_network.h"
-#include "voe_audio_processing.h"
-#include "voe_volume_control.h"
-#include "voe_hardware.h"
-#include "voe_rtp_rtcp.h"
-#include "voe_encryption.h"
+#include "webrtc/voice_engine/include/voe_audio_processing.h"
+#include "webrtc/voice_engine/include/voe_base.h"
+#include "webrtc/voice_engine/include/voe_codec.h"
+#include "webrtc/voice_engine/include/voe_encryption.h"
+#include "webrtc/voice_engine/include/voe_file.h"
+#include "webrtc/voice_engine/include/voe_hardware.h"
+#include "webrtc/voice_engine/include/voe_network.h"
+#include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
+#include "webrtc/voice_engine/include/voe_volume_control.h"
 
-#include "voe_test_interface.h"
+#include "webrtc/voice_engine/test/auto_test/voe_test_interface.h"
 
 //#define INIT_FROM_THREAD
 //#define START_CALL_FROM_THREAD

webrtc/voice_engine/test/auto_test/automated_mode.cc

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "gtest/gtest.h"
-#include "test/testsupport/fileutils.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/test/testsupport/fileutils.h"
 
 void InitializeGoogleTest(int* argc, char** argv) {
   // Initialize WebRTC testing framework so paths to resources can be resolved.

webrtc/voice_engine/test/auto_test/extended/agc_config_test.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
 
 class AgcConfigTest : public AfterStreamingFixture {
  protected:

webrtc/voice_engine/test/auto_test/extended/ec_metrics_test.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
 
 class EcMetricsTest : public AfterStreamingFixture {
 };

webrtc/voice_engine/test/auto_test/fakes/fake_external_transport.cc

@@ -13,8 +13,8 @@
 #include "webrtc/system_wrappers/interface/sleep.h"
 #include "webrtc/system_wrappers/interface/thread_wrapper.h"
 #include "webrtc/voice_engine/include/voe_network.h"
-#include "webrtc/voice_engine/voice_engine_defines.h"
 #include "webrtc/voice_engine/test/auto_test/fakes/fake_external_transport.h"
+#include "webrtc/voice_engine/voice_engine_defines.h"
 
 FakeExternalTransport::FakeExternalTransport(webrtc::VoENetwork* ptr)
     : my_network_(ptr),

webrtc/voice_engine/test/auto_test/fakes/fake_external_transport.h

@@ -10,7 +10,7 @@
 #ifndef VOICE_ENGINE_MAIN_TEST_AUTO_TEST_FAKES_FAKE_EXTERNAL_TRANSPORT_H_
 #define VOICE_ENGINE_MAIN_TEST_AUTO_TEST_FAKES_FAKE_EXTERNAL_TRANSPORT_H_
 
-#include "common_types.h"
+#include "webrtc/common_types.h"
 
 namespace webrtc {
 class CriticalSectionWrapper;

webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "after_initialization_fixture.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h"
 
 class TestErrorObserver : public webrtc::VoiceEngineObserver {
  public:

webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h

@@ -11,9 +11,9 @@
 #ifndef SRC_VOICE_ENGINE_MAIN_TEST_AUTO_TEST_STANDARD_TEST_BASE_AFTER_INIT_H_
 #define SRC_VOICE_ENGINE_MAIN_TEST_AUTO_TEST_STANDARD_TEST_BASE_AFTER_INIT_H_
 
-#include "before_initialization_fixture.h"
-#include "scoped_ptr.h"
 #include "webrtc/common_types.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h"
 
 class TestErrorObserver;
 

webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "after_streaming_fixture.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
 
 #include <cstring>
 

webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h

@@ -11,8 +11,8 @@
 #ifndef SRC_VOICE_ENGINE_MAIN_TEST_AUTO_TEST_STANDARD_AFTER_STREAMING_H_
 #define SRC_VOICE_ENGINE_MAIN_TEST_AUTO_TEST_STANDARD_AFTER_STREAMING_H_
 
-#include "after_initialization_fixture.h"
-#include "resource_manager.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h"
+#include "webrtc/voice_engine/test/auto_test/resource_manager.h"
 
 // This fixture will, in addition to the work done by its superclasses,
 // create a channel and start playing a file through the fake microphone

webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h

@@ -13,24 +13,24 @@
 
 #include <assert.h>
 
-#include "common_types.h"
-#include "engine_configurations.h"
-#include "test/testsupport/gtest_disable.h"
-#include "voice_engine/include/voe_audio_processing.h"
-#include "voice_engine/include/voe_base.h"
-#include "voice_engine/include/voe_call_report.h"
-#include "voice_engine/include/voe_codec.h"
-#include "voice_engine/include/voe_dtmf.h"
-#include "voice_engine/include/voe_encryption.h"
-#include "voice_engine/include/voe_errors.h"
-#include "voice_engine/include/voe_external_media.h"
-#include "voice_engine/include/voe_file.h"
-#include "voice_engine/include/voe_hardware.h"
-#include "voice_engine/include/voe_neteq_stats.h"
-#include "voice_engine/include/voe_network.h"
-#include "voice_engine/include/voe_rtp_rtcp.h"
-#include "voice_engine/include/voe_video_sync.h"
-#include "voice_engine/include/voe_volume_control.h"
+#include "webrtc/common_types.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/test/testsupport/gtest_disable.h"
+#include "webrtc/voice_engine/include/voe_audio_processing.h"
+#include "webrtc/voice_engine/include/voe_base.h"
+#include "webrtc/voice_engine/include/voe_call_report.h"
+#include "webrtc/voice_engine/include/voe_codec.h"
+#include "webrtc/voice_engine/include/voe_dtmf.h"
+#include "webrtc/voice_engine/include/voe_encryption.h"
+#include "webrtc/voice_engine/include/voe_errors.h"
+#include "webrtc/voice_engine/include/voe_external_media.h"
+#include "webrtc/voice_engine/include/voe_file.h"
+#include "webrtc/voice_engine/include/voe_hardware.h"
+#include "webrtc/voice_engine/include/voe_neteq_stats.h"
+#include "webrtc/voice_engine/include/voe_network.h"
+#include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
+#include "webrtc/voice_engine/include/voe_video_sync.h"
+#include "webrtc/voice_engine/include/voe_volume_control.h"
 #include "webrtc/voice_engine/test/auto_test/voe_test_common.h"
 
 #include "testing/gmock/include/gmock/gmock.h"

webrtc/voice_engine/test/auto_test/fuzz/rtp_fuzz_test.cc

@@ -10,8 +10,8 @@
 
 #include <ctime>
 
-#include "test/libtest/include/bit_flip_encryption.h"
-#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "webrtc/test/libtest/include/bit_flip_encryption.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
 
 class RtpFuzzTest : public AfterStreamingFixture {
  protected:

webrtc/voice_engine/test/auto_test/resource_manager.cc

@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "resource_manager.h"
+#include "webrtc/voice_engine/test/auto_test/resource_manager.h"
 
-#include "testsupport/fileutils.h"
+#include "webrtc/test/testsupport/fileutils.h"
 
 ResourceManager::ResourceManager() {
   std::string filename = "audio_long16.pcm";
@@ -26,4 +26,3 @@ ResourceManager::ResourceManager() {
   }
 #endif
 }
-

webrtc/voice_engine/test/auto_test/standard/audio_processing_test.cc

@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "testsupport/fileutils.h"
-#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
-#include "voice_engine/test/auto_test/voe_standard_test.h"
+#include "webrtc/test/testsupport/fileutils.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "webrtc/voice_engine/test/auto_test/voe_standard_test.h"
 
 class RxCallback : public webrtc::VoERxVadCallback {
  public:

webrtc/voice_engine/test/auto_test/standard/call_report_test.cc

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "after_streaming_fixture.h"
-#include "testsupport/fileutils.h"
+#include "webrtc/test/testsupport/fileutils.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
 
 class CallReportTest : public AfterStreamingFixture {
 };

webrtc/voice_engine/test/auto_test/standard/codec_before_streaming_test.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "after_initialization_fixture.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h"
 
 class CodecBeforeStreamingTest : public AfterInitializationFixture {
  protected:

webrtc/voice_engine/test/auto_test/standard/codec_test.cc

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "after_streaming_fixture.h"
-#include "voice_engine_defines.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "webrtc/voice_engine/voice_engine_defines.h"
 
 class CodecTest : public AfterStreamingFixture {
  protected:

webrtc/voice_engine/test/auto_test/standard/dtmf_test.cc

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "after_streaming_fixture.h"
-#include "voice_engine_defines.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "webrtc/voice_engine/voice_engine_defines.h"
 
 class DtmfTest : public AfterStreamingFixture {
  protected:

webrtc/voice_engine/test/auto_test/standard/encryption_test.cc

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "voice_engine/include/voe_encryption.h"
-#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "webrtc/voice_engine/include/voe_encryption.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
 
 class BasicBitInverseEncryption : public webrtc::Encryption {
   void encrypt(int channel_no, unsigned char* in_data,

webrtc/voice_engine/test/auto_test/standard/external_media_test.cc

@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "modules/interface/module_common_types.h"
-#include "voice_engine/include/voe_external_media.h"
-#include "voice_engine/test/auto_test/fakes/fake_media_process.h"
-#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/voice_engine/include/voe_external_media.h"
+#include "webrtc/voice_engine/test/auto_test/fakes/fake_media_process.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
 
 class ExternalMediaTest : public AfterStreamingFixture {
  protected:

webrtc/voice_engine/test/auto_test/standard/file_before_streaming_test.cc

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "after_initialization_fixture.h"
-#include "test/testsupport/fileutils.h"
+#include "webrtc/test/testsupport/fileutils.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h"
 
 namespace {
 

webrtc/voice_engine/test/auto_test/standard/file_test.cc

@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
-#include "voice_engine/test/auto_test/voe_standard_test.h"
-#include "test/testsupport/fileutils.h"
+#include "webrtc/test/testsupport/fileutils.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "webrtc/voice_engine/test/auto_test/voe_standard_test.h"
 
 
 class FileTest : public AfterStreamingFixture {

webrtc/voice_engine/test/auto_test/standard/hardware_before_initializing_test.cc

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "common_types.h"
-#include "before_initialization_fixture.h"
+#include "webrtc/common_types.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h"
 
 using namespace webrtc;
 

webrtc/voice_engine/test/auto_test/standard/hardware_before_streaming_test.cc

@@ -10,7 +10,7 @@
 
 #include <cstring>
 
-#include "after_initialization_fixture.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h"
 
 using namespace webrtc;
 

webrtc/voice_engine/test/auto_test/standard/hardware_test.cc

@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "after_streaming_fixture.h"
-#include "modules/audio_device/include/audio_device.h"
+#include "webrtc/modules/audio_device/include/audio_device.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
 
 class HardwareTest : public AfterStreamingFixture {
 };

webrtc/voice_engine/test/auto_test/standard/manual_hold_test.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "after_streaming_fixture.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
 
 // Note: This class includes sleeps and requires manual verification.
 class ManualHoldTest : public AfterStreamingFixture {

webrtc/voice_engine/test/auto_test/standard/mixing_test.cc

@@ -12,8 +12,8 @@
 
 #include <string>
 
-#include "after_initialization_fixture.h"
-#include "test/testsupport/fileutils.h"
+#include "webrtc/test/testsupport/fileutils.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h"
 
 namespace webrtc {
 namespace {

webrtc/voice_engine/test/auto_test/standard/neteq_stats_test.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
 
 class NetEQStatsTest : public AfterStreamingFixture {
 };

webrtc/voice_engine/test/auto_test/standard/neteq_test.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "after_streaming_fixture.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
 
 class NetEQTest : public AfterStreamingFixture {
  protected:

webrtc/voice_engine/test/auto_test/standard/network_test.cc

@@ -8,12 +8,12 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "voice_engine/test/auto_test/fakes/fake_external_transport.h"
-#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
-#include "voice_engine/test/auto_test/voe_test_interface.h"
-#include "voice_engine/test/auto_test/voe_standard_test.h"
-#include "voice_engine/include/mock/mock_voe_connection_observer.h"
-#include "voice_engine/include/mock/mock_voe_observer.h"
+#include "webrtc/voice_engine/include/mock/mock_voe_connection_observer.h"
+#include "webrtc/voice_engine/include/mock/mock_voe_observer.h"
+#include "webrtc/voice_engine/test/auto_test/fakes/fake_external_transport.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "webrtc/voice_engine/test/auto_test/voe_standard_test.h"
+#include "webrtc/voice_engine/test/auto_test/voe_test_interface.h"
 
 static const int kDefaultRtpPort = 8000;
 static const int kDefaultRtcpPort = 8001;

webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_before_streaming_test.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "after_initialization_fixture.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h"
 
 using namespace webrtc;
 using namespace testing;

webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc

@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "test/testsupport/fileutils.h"
-#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
-#include "voice_engine/test/auto_test/voe_standard_test.h"
+#include "webrtc/test/testsupport/fileutils.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "webrtc/voice_engine/test/auto_test/voe_standard_test.h"
 
 class TestRtpObserver : public webrtc::VoERTPObserver {
  public:

webrtc/voice_engine/test/auto_test/standard/video_sync_test.cc

@@ -12,7 +12,7 @@
 #include <numeric>
 #include <vector>
 
-#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
 
 #ifdef WEBRTC_IOS
   const int kMinimumReasonableDelayEstimateMs = 30;

webrtc/voice_engine/test/auto_test/standard/voe_base_misc_test.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "voice_engine/test/auto_test/fixtures/before_initialization_fixture.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/before_initialization_fixture.h"
 
 #include <cstdlib>
 

webrtc/voice_engine/test/auto_test/standard/volume_test.cc

@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "after_streaming_fixture.h"
+#include "webrtc/voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
 
 namespace {
 

webrtc/voice_engine/test/auto_test/voe_cpu_test.cc

@@ -8,12 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "voe_cpu_test.h"
+#include "webrtc/voice_engine/test/auto_test/voe_cpu_test.h"
 
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
-#include <cassert>
 #if defined(_WIN32)
 #include <conio.h>
 #endif

webrtc/voice_engine/test/auto_test/voe_cpu_test.h

@@ -11,7 +11,7 @@
 #ifndef WEBRTC_VOICE_ENGINE_VOE_CPU_TEST_H
 #define WEBRTC_VOICE_ENGINE_VOE_CPU_TEST_H
 
-#include "voe_standard_test.h"
+#include "webrtc/voice_engine/test/auto_test/voe_standard_test.h"
 
 namespace voetest {
 

webrtc/voice_engine/test/auto_test/voe_extended_test.cc

@@ -15,8 +15,8 @@
 #include <vector>
 
 #include "webrtc/test/testsupport/fileutils.h"
-#include "webrtc/voice_engine/voice_engine_defines.h"
 #include "webrtc/voice_engine/test/auto_test/voe_test_defines.h"
+#include "webrtc/voice_engine/voice_engine_defines.h"
 
 #if defined(_WIN32)
 #include <conio.h>

webrtc/voice_engine/test/auto_test/voe_extended_test.h

@@ -11,15 +11,15 @@
 #ifndef WEBRTC_VOICE_ENGINE_VOE_EXTENDED_TEST_H
 #define WEBRTC_VOICE_ENGINE_VOE_EXTENDED_TEST_H
 
-#include "voe_standard_test.h"
 #include "webrtc/modules/audio_device/include/audio_device.h"
 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/interface/event_wrapper.h"
 #include "webrtc/system_wrappers/interface/ref_count.h"
+#include "webrtc/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/system_wrappers/interface/sleep.h"
 #include "webrtc/system_wrappers/interface/thread_wrapper.h"
-#include "webrtc/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/test/channel_transport/include/channel_transport.h"
+#include "webrtc/voice_engine/test/auto_test/voe_standard_test.h"
 
 namespace voetest {
 

webrtc/voice_engine/test/auto_test/voe_standard_test.cc

@@ -8,21 +8,21 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "voice_engine/test/auto_test/voe_standard_test.h"
+#include "webrtc/voice_engine/test/auto_test/voe_standard_test.h"
 
 #include <stdio.h>
 #include <string.h>
 
-#include "engine_configurations.h"
-#include "system_wrappers/interface/event_wrapper.h"
-#include "voice_engine/include/voe_neteq_stats.h"
-#include "voice_engine/test/auto_test/automated_mode.h"
-#include "voice_engine/test/auto_test/voe_cpu_test.h"
-#include "voice_engine/test/auto_test/voe_extended_test.h"
-#include "voice_engine/test/auto_test/voe_stress_test.h"
-#include "voice_engine/test/auto_test/voe_test_defines.h"
-#include "voice_engine/test/auto_test/voe_unit_test.h"
-#include "voice_engine/voice_engine_defines.h"
+#include "webrtc/engine_configurations.h"
+#include "webrtc/system_wrappers/interface/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_extended_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/test/auto_test/voe_unit_test.h"
+#include "webrtc/voice_engine/voice_engine_defines.h"
 
 DEFINE_bool(include_timing_dependent_tests, true,
             "If true, we will include tests / parts of tests that are known "

webrtc/voice_engine/test/auto_test/voe_standard_test.h

@@ -15,36 +15,36 @@
 #include <string>
 
 #include "gflags/gflags.h"
-#include "resource_manager.h"
-#include "voe_audio_processing.h"
-#include "voe_base.h"
-#include "voe_dtmf.h"
-#include "voe_errors.h"
-#include "voe_file.h"
-#include "voe_rtp_rtcp.h"
-#include "voe_test_common.h"
-#include "voe_test_interface.h"
+#include "webrtc/voice_engine/include/voe_audio_processing.h"
+#include "webrtc/voice_engine/include/voe_base.h"
+#include "webrtc/voice_engine/include/voe_dtmf.h"
+#include "webrtc/voice_engine/include/voe_errors.h"
+#include "webrtc/voice_engine/include/voe_file.h"
+#include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
+#include "webrtc/voice_engine/test/auto_test/resource_manager.h"
+#include "webrtc/voice_engine/test/auto_test/voe_test_common.h"
+#include "webrtc/voice_engine/test/auto_test/voe_test_interface.h"
 #ifdef WEBRTC_VOICE_ENGINE_CALL_REPORT_API
-#include "voe_call_report.h"
+#include "webrtc/voice_engine/include/voe_call_report.h"
 #endif
 #ifdef WEBRTC_VOICE_ENGINE_CODEC_API
-#include "voe_codec.h"
+#include "webrtc/voice_engine/include/voe_codec.h"
 #endif
 #ifdef WEBRTC_VOICE_ENGINE_ENCRYPTION_API
-#include "voe_encryption.h"
+#include "webrtc/voice_engine/include/voe_encryption.h"
 #endif
 #ifdef WEBRTC_VOICE_ENGINE_EXTERNAL_MEDIA_API
-#include "voe_external_media.h"
+#include "webrtc/voice_engine/include/voe_external_media.h"
 #endif
 #ifdef WEBRTC_VOICE_ENGINE_HARDWARE_API
-#include "voe_hardware.h"
+#include "webrtc/voice_engine/include/voe_hardware.h"
 #endif
-#include "voe_network.h"
+#include "webrtc/voice_engine/include/voe_network.h"
 #ifdef WEBRTC_VOICE_ENGINE_VIDEO_SYNC_API
-#include "voe_video_sync.h"
+#include "webrtc/voice_engine/include/voe_video_sync.h"
 #endif
 #ifdef WEBRTC_VOICE_ENGINE_VOLUME_CONTROL_API
-#include "voe_volume_control.h"
+#include "webrtc/voice_engine/include/voe_volume_control.h"
 #endif
 
 #ifdef WEBRTC_VOICE_ENGINE_NETEQ_STATS_API

webrtc/voice_engine/test/auto_test/voe_stress_test.cc

@@ -13,11 +13,11 @@
 //       How much trace should we have enabled?
 //       API error counter, to print info and return -1 if any error.
 
-#include <stdlib.h>
+#include <assert.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <cassert>
 #if defined(_WIN32)
 #include <conio.h>
 #endif
@@ -52,13 +52,6 @@ namespace voetest {
 #define PAUSE_OR_SLEEP(x) SleepMs(x);
 #endif
 
-const char* VoEStressTest::_key = "====YUtFWRAAAAADBtIHgAAAAAEAAAAcAAAAAQBHU0ds"
-  "b2JhbCBJUCBTb3VuZAAC\nAAAAIwAAAExpY2Vuc2VkIHRvIE5vcnRlbCBOZXR3cm9rcwAAAAA"
-  "xAAAAZxZ7/u0M\niFYyTwSwko5Uutf7mh8S0O4rYZYTFidbzQeuGonuL17F/2oD/2pfDp3jL4"
-  "Rf3z/A\nnlJsEJgEtASkDNFuwLILjGY0pzjjAYQp3pCl6z6k2MtE06AirdjGLYCjENpq/opX"
-  "\nOrs3sIuwdYK5va/aFcsjBDmlsGCUM48RDYG9s23bIHYafXUC4ofOaubbZPWiPTmL\nEVJ8WH"
-  "4F9pgNjALc14oJXfON7r/3\n=EsLx";
-
 int VoEStressTest::DoTest() {
   int test(-1);
   while (test != 0) {

webrtc/voice_engine/test/auto_test/voe_stress_test.h

@@ -40,7 +40,6 @@ class VoEStressTest {
   bool ProcessExtraApi();
 
   VoETestManager& _mgr;
-  static const char* _key;
 
   ThreadWrapper* _ptrExtraApiThread;
 };

webrtc/voice_engine/test/auto_test/voe_test_defines.h

@@ -14,7 +14,7 @@
 #include "webrtc/voice_engine/test/auto_test/voe_test_common.h"
 
 // Read WEBRTC_VOICE_ENGINE_XXX_API compiler flags
-#include "engine_configurations.h"
+#include "webrtc/engine_configurations.h"
 
 // Select the tests to execute, list order below is same as they will be
 // executed. Note that, all settings below will be overriden by sub-API

webrtc/voice_engine/test/auto_test/voe_test_interface.h

@@ -15,7 +15,7 @@
 #ifndef WEBRTC_VOICE_ENGINE_VOE_TEST_INTERFACE_H
 #define WEBRTC_VOICE_ENGINE_VOE_TEST_INTERFACE_H
 
-#include "common_types.h"
+#include "webrtc/common_types.h"
 
 namespace voetest {
 // TODO(andrew): Using directives not permitted.

webrtc/voice_engine/test/auto_test/voe_unit_test.cc

@@ -10,20 +10,20 @@
 
 #include "webrtc/voice_engine/test/auto_test/voe_unit_test.h"
 
+#include <assert.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
-#include <cassert>
 #if defined(_WIN32)
 #include <conio.h>
 #endif
 
-#include "webrtc/system_wrappers/interface/thread_wrapper.h"
 #include "webrtc/system_wrappers/interface/sleep.h"
+#include "webrtc/system_wrappers/interface/thread_wrapper.h"
 #include "webrtc/test/testsupport/fileutils.h"
-#include "webrtc/voice_engine/voice_engine_defines.h"
-#include "webrtc/voice_engine/test/auto_test/voe_test_defines.h"
 #include "webrtc/voice_engine/test/auto_test/fakes/fake_media_process.h"
+#include "webrtc/voice_engine/test/auto_test/voe_test_defines.h"
+#include "webrtc/voice_engine/voice_engine_defines.h"
 
 using namespace webrtc;
 using namespace test;

webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc

@@ -17,25 +17,25 @@
 
 #include <vector>
 
-#include "gtest/gtest.h"
-#include "voe_errors.h"
-#include "voe_base.h"
-#include "voe_codec.h"
-#include "voe_volume_control.h"
-#include "voe_dtmf.h"
-#include "voe_rtp_rtcp.h"
-#include "voe_audio_processing.h"
-#include "voe_file.h"
-#include "voe_video_sync.h"
-#include "voe_encryption.h"
-#include "voe_hardware.h"
-#include "voe_external_media.h"
-#include "voe_network.h"
-#include "voe_neteq_stats.h"
-#include "engine_configurations.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/engine_configurations.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/test/channel_transport/include/channel_transport.h"
 #include "webrtc/test/testsupport/fileutils.h"
+#include "webrtc/voice_engine/include/voe_audio_processing.h"
+#include "webrtc/voice_engine/include/voe_base.h"
+#include "webrtc/voice_engine/include/voe_codec.h"
+#include "webrtc/voice_engine/include/voe_dtmf.h"
+#include "webrtc/voice_engine/include/voe_encryption.h"
+#include "webrtc/voice_engine/include/voe_errors.h"
+#include "webrtc/voice_engine/include/voe_external_media.h"
+#include "webrtc/voice_engine/include/voe_file.h"
+#include "webrtc/voice_engine/include/voe_hardware.h"
+#include "webrtc/voice_engine/include/voe_neteq_stats.h"
+#include "webrtc/voice_engine/include/voe_network.h"
+#include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
+#include "webrtc/voice_engine/include/voe_video_sync.h"
+#include "webrtc/voice_engine/include/voe_volume_control.h"
 
 using namespace webrtc;
 using namespace test;

webrtc/voice_engine/test/win_test/WinTest.cc

@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "stdafx.h"
-#include "WinTest.h"
-#include "WinTestDlg.h"
+#include "webrtc/voice_engine/test/win_test/WinTest.h"
+#include "webrtc/voice_engine/test/win_test/WinTestDlg.h"
+#include "webrtc/voice_engine/test/win_test/stdafx.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW

webrtc/voice_engine/test/win_test/WinTestDlg.cc

@@ -9,10 +9,10 @@
  */
 
 #include <math.h>
-#include "stdafx.h"
-#include "WinTest.h"
-#include "WinTestDlg.h"
-#include "testsupport/fileutils.h"
+#include "webrtc/test/testsupport/fileutils.h"
+#include "webrtc/voice_engine/test/win_test/WinTest.h"
+#include "webrtc/voice_engine/test/win_test/WinTestDlg.h"
+#include "webrtc/voice_engine/test/win_test/stdafx.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -3585,4 +3585,3 @@ void CWinTestDlg::OnBnClickedButtonTest1()
 {
     // add tests here...
 }
-

webrtc/voice_engine/test/win_test/WinTestDlg.h

@@ -80,21 +80,21 @@
 
 #include <string>
 
-#include "voe_base.h"
-#include "voe_rtp_rtcp.h"
-#include "voe_codec.h"
-#include "voe_dtmf.h"
-#include "voe_encryption.h"
-#include "voe_external_media.h"
-#include "voe_file.h"
-#include "voe_hardware.h"
-#include "voe_network.h"
-#include "voe_video_sync.h"
-#include "voe_volume_control.h"
+#include "webrtc/voice_engine/include/voe_base.h"
+#include "webrtc/voice_engine/include/voe_codec.h"
+#include "webrtc/voice_engine/include/voe_dtmf.h"
+#include "webrtc/voice_engine/include/voe_encryption.h"
+#include "webrtc/voice_engine/include/voe_external_media.h"
+#include "webrtc/voice_engine/include/voe_file.h"
+#include "webrtc/voice_engine/include/voe_hardware.h"
+#include "webrtc/voice_engine/include/voe_network.h"
+#include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
+#include "webrtc/voice_engine/include/voe_video_sync.h"
+#include "webrtc/voice_engine/include/voe_volume_control.h"
 
-#include "voe_audio_processing.h"
-#include "voe_rtp_rtcp.h"
-#include "voe_errors.h"
+#include "webrtc/voice_engine/include/voe_audio_processing.h"
+#include "webrtc/voice_engine/include/voe_errors.h"
+#include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
 
 class MediaProcessImpl;
 class ConnectionObserver;

webrtc/voice_engine/test/win_test/stdafx.cc

@@ -12,6 +12,4 @@
 // WinTest.pch will be the pre-compiled header
 // stdafx.obj will contain the pre-compiled type information
 
-#include "stdafx.h"
-
-
+#include "webrtc/voice_engine/test/win_test/stdafx.h"

webrtc/voice_engine/transmit_mixer_unittest.cc

@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "voice_engine/transmit_mixer.h"
+#include "webrtc/voice_engine/transmit_mixer.h"
 
-#include "gtest/gtest.h"
-#include "voice_engine/include/voe_external_media.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/voice_engine/include/voe_external_media.h"
 
 namespace webrtc {
 namespace voe {

webrtc/voice_engine/utility.cc

@@ -8,11 +8,11 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "utility.h"
+#include "webrtc/voice_engine/utility.h"
 
-#include "module.h"
-#include "trace.h"
-#include "signal_processing_library.h"
+#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
+#include "webrtc/modules/interface/module.h"
+#include "webrtc/system_wrappers/interface/trace.h"
 
 namespace webrtc
 {

webrtc/voice_engine/utility.h

@@ -15,8 +15,8 @@
 #ifndef WEBRTC_VOICE_ENGINE_UTILITY_H
 #define WEBRTC_VOICE_ENGINE_UTILITY_H
 
-#include "typedefs.h"
-#include "voice_engine_defines.h"
+#include "webrtc/typedefs.h"
+#include "webrtc/voice_engine/voice_engine_defines.h"
 
 namespace webrtc
 {

webrtc/voice_engine/voe_audio_processing_impl.cc

@@ -8,16 +8,16 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "voe_audio_processing_impl.h"
+#include "webrtc/voice_engine/voe_audio_processing_impl.h"
 
-#include "audio_processing.h"
-#include "channel.h"
-#include "critical_section_wrapper.h"
-#include "logging.h"
-#include "trace.h"
-#include "transmit_mixer.h"
-#include "voe_errors.h"
-#include "voice_engine_impl.h"
+#include "webrtc/modules/audio_processing/include/audio_processing.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/logging.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/voice_engine/channel.h"
+#include "webrtc/voice_engine/include/voe_errors.h"
+#include "webrtc/voice_engine/transmit_mixer.h"
+#include "webrtc/voice_engine/voice_engine_impl.h"
 
 // TODO(andrew): move to a common place.
 #define WEBRTC_VOICE_INIT_CHECK()                        \

webrtc/voice_engine/voe_audio_processing_impl.h

@@ -11,9 +11,9 @@
 #ifndef WEBRTC_VOICE_ENGINE_VOE_AUDIO_PROCESSING_IMPL_H
 #define WEBRTC_VOICE_ENGINE_VOE_AUDIO_PROCESSING_IMPL_H
 
-#include "voe_audio_processing.h"
+#include "webrtc/voice_engine/include/voe_audio_processing.h"
 
-#include "shared_data.h"
+#include "webrtc/voice_engine/shared_data.h"
 
 namespace webrtc {
 
@@ -110,4 +110,3 @@ class VoEAudioProcessingImpl : public VoEAudioProcessing {
 }  //  namespace webrtc
 
 #endif  // WEBRTC_VOICE_ENGINE_VOE_AUDIO_PROCESSING_IMPL_H
-

webrtc/voice_engine/voe_audio_processing_unittest.cc

@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "voice_engine/include/voe_audio_processing.h"
+#include "webrtc/voice_engine/include/voe_audio_processing.h"
 
-#include "gtest/gtest.h"
-#include "voice_engine/include/voe_base.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/voice_engine/include/voe_base.h"
 
 namespace webrtc {
 namespace voe {

webrtc/voice_engine/voe_base_impl.cc

@@ -8,21 +8,21 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "voe_base_impl.h"
+#include "webrtc/voice_engine/voe_base_impl.h"
 
-#include "audio_coding_module.h"
-#include "audio_processing.h"
-#include "channel.h"
-#include "critical_section_wrapper.h"
-#include "file_wrapper.h"
-#include "modules/audio_device/audio_device_impl.h"
-#include "output_mixer.h"
-#include "signal_processing_library.h"
-#include "trace.h"
-#include "transmit_mixer.h"
-#include "utility.h"
-#include "voe_errors.h"
-#include "voice_engine_impl.h"
+#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
+#include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h"
+#include "webrtc/modules/audio_device/audio_device_impl.h"
+#include "webrtc/modules/audio_processing/include/audio_processing.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/file_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/voice_engine/channel.h"
+#include "webrtc/voice_engine/include/voe_errors.h"
+#include "webrtc/voice_engine/output_mixer.h"
+#include "webrtc/voice_engine/transmit_mixer.h"
+#include "webrtc/voice_engine/utility.h"
+#include "webrtc/voice_engine/voice_engine_impl.h"
 
 #if (defined(_WIN32) && defined(_DLL) && (_MSC_VER == 1400))
 // Fix for VS 2005 MD/MDd link problem

webrtc/voice_engine/voe_base_impl.h

@@ -11,10 +11,10 @@
 #ifndef WEBRTC_VOICE_ENGINE_VOE_BASE_IMPL_H
 #define WEBRTC_VOICE_ENGINE_VOE_BASE_IMPL_H
 
-#include "voe_base.h"
+#include "webrtc/voice_engine/include/voe_base.h"
 
-#include "module_common_types.h"
-#include "shared_data.h"
+#include "webrtc/modules/interface/module_common_types.h"
+#include "webrtc/voice_engine/shared_data.h"
 
 namespace webrtc
 {

webrtc/voice_engine/voe_base_unittest.cc

@@ -11,8 +11,8 @@
 #include "webrtc/voice_engine/include/voe_base.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/modules/audio_device/include/fake_audio_device.h"
+#include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 
 namespace webrtc {

webrtc/voice_engine/voe_call_report_impl.cc

@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "voe_call_report_impl.h"
+#include "webrtc/voice_engine/voe_call_report_impl.h"
 
-#include "audio_processing.h"
-#include "channel.h"
-#include "critical_section_wrapper.h"
-#include "file_wrapper.h"
-#include "trace.h"
-#include "voe_errors.h"
-#include "voice_engine_impl.h"
+#include "webrtc/modules/audio_processing/include/audio_processing.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/file_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/voice_engine/channel.h"
+#include "webrtc/voice_engine/include/voe_errors.h"
+#include "webrtc/voice_engine/voice_engine_impl.h"
 
 namespace webrtc
 {

webrtc/voice_engine/voe_call_report_impl.h

@@ -11,9 +11,9 @@
 #ifndef WEBRTC_VOICE_ENGINE_VOE_CALL_REPORT_IMPL_H
 #define WEBRTC_VOICE_ENGINE_VOE_CALL_REPORT_IMPL_H
 
-#include "voe_call_report.h"
+#include "webrtc/voice_engine/include/voe_call_report.h"
 
-#include "shared_data.h"
+#include "webrtc/voice_engine/shared_data.h"
 
 
 namespace webrtc

webrtc/voice_engine/voe_codec_impl.cc

@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "voe_codec_impl.h"
+#include "webrtc/voice_engine/voe_codec_impl.h"
 
-#include "audio_coding_module.h"
-#include "channel.h"
-#include "critical_section_wrapper.h"
-#include "trace.h"
-#include "voe_errors.h"
-#include "voice_engine_impl.h"
+#include "webrtc/modules/audio_coding/main/interface/audio_coding_module.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/voice_engine/channel.h"
+#include "webrtc/voice_engine/include/voe_errors.h"
+#include "webrtc/voice_engine/voice_engine_impl.h"
 
 namespace webrtc
 {

webrtc/voice_engine/voe_codec_impl.h

@@ -11,9 +11,9 @@
 #ifndef WEBRTC_VOICE_ENGINE_VOE_CODEC_IMPL_H
 #define WEBRTC_VOICE_ENGINE_VOE_CODEC_IMPL_H
 
-#include "voe_codec.h"
+#include "webrtc/voice_engine/include/voe_codec.h"
 
-#include "shared_data.h"
+#include "webrtc/voice_engine/shared_data.h"
 
 namespace webrtc
 {

webrtc/voice_engine/voe_codec_unittest.cc

@@ -10,7 +10,7 @@
 
 #include "webrtc/voice_engine/include/voe_codec.h"
 
-#include "gtest/gtest.h"
+#include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/modules/audio_device/include/fake_audio_device.h"
 #include "webrtc/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/voice_engine/include/voe_base.h"

webrtc/voice_engine/voe_encryption_impl.cc

@@ -8,14 +8,14 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "voe_encryption_impl.h"
+#include "webrtc/voice_engine/voe_encryption_impl.h"
 
 
-#include "channel.h"
-#include "critical_section_wrapper.h"
-#include "trace.h"
-#include "voe_errors.h"
-#include "voice_engine_impl.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/voice_engine/channel.h"
+#include "webrtc/voice_engine/include/voe_errors.h"
+#include "webrtc/voice_engine/voice_engine_impl.h"
 
 namespace webrtc {
 

webrtc/voice_engine/voe_encryption_impl.h

@@ -11,9 +11,9 @@
 #ifndef WEBRTC_VOICE_ENGINE_VOE_ENCRYPTION_IMPL_H
 #define WEBRTC_VOICE_ENGINE_VOE_ENCRYPTION_IMPL_H
 
-#include "voe_encryption.h"
+#include "webrtc/voice_engine/include/voe_encryption.h"
 
-#include "shared_data.h"
+#include "webrtc/voice_engine/shared_data.h"
 
 namespace webrtc {
 

webrtc/voice_engine/voe_external_media_impl.cc

@@ -8,15 +8,15 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "voe_external_media_impl.h"
+#include "webrtc/voice_engine/voe_external_media_impl.h"
 
-#include "channel.h"
-#include "critical_section_wrapper.h"
-#include "output_mixer.h"
-#include "trace.h"
-#include "transmit_mixer.h"
-#include "voice_engine_impl.h"
-#include "voe_errors.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/voice_engine/channel.h"
+#include "webrtc/voice_engine/include/voe_errors.h"
+#include "webrtc/voice_engine/output_mixer.h"
+#include "webrtc/voice_engine/transmit_mixer.h"
+#include "webrtc/voice_engine/voice_engine_impl.h"
 
 namespace webrtc {
 

webrtc/voice_engine/voe_external_media_impl.h

@@ -11,9 +11,9 @@
 #ifndef WEBRTC_VOICE_ENGINE_VOE_EXTERNAL_MEDIA_IMPL_H
 #define WEBRTC_VOICE_ENGINE_VOE_EXTERNAL_MEDIA_IMPL_H
 
-#include "voe_external_media.h"
+#include "webrtc/voice_engine/include/voe_external_media.h"
 
-#include "shared_data.h"
+#include "webrtc/voice_engine/shared_data.h"
 
 namespace webrtc {
 

webrtc/voice_engine/voe_file_impl.cc

@@ -8,17 +8,17 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "voe_file_impl.h"
+#include "webrtc/voice_engine/voe_file_impl.h"
 
-#include "channel.h"
-#include "critical_section_wrapper.h"
-#include "file_wrapper.h"
-#include "media_file.h"
-#include "output_mixer.h"
-#include "trace.h"
-#include "transmit_mixer.h"
-#include "voe_errors.h"
-#include "voice_engine_impl.h"
+#include "webrtc/modules/media_file/interface/media_file.h"
+#include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
+#include "webrtc/system_wrappers/interface/file_wrapper.h"
+#include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/voice_engine/channel.h"
+#include "webrtc/voice_engine/include/voe_errors.h"
+#include "webrtc/voice_engine/output_mixer.h"
+#include "webrtc/voice_engine/transmit_mixer.h"
+#include "webrtc/voice_engine/voice_engine_impl.h"
 
 namespace webrtc {