Reorganize voice_engine/.

The usual changes:
voice_engine/main/source -> voice_engine/
voice_engine/main/interface -> voice_engine/include
voice_engine/main/test -> voice_engine/test
Include path changes.

BUG=none
TEST=trybots

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

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

src/modules/media_file/source/media_file_unittest.cc

@@ -11,7 +11,7 @@
 #include "gtest/gtest.h"
 #include "modules/media_file/interface/media_file.h"
 #include "testsupport/fileutils.h"
-#include "voice_engine/main/source/voice_engine_defines.h" // defines SLEEP
+#include "voice_engine/voice_engine_defines.h" // defines SLEEP
 
 class MediaFileTest : public testing::Test {
  protected:

src/video_engine/Android.mk

@@ -74,7 +74,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../modules/video_processing/main/interface \
     $(LOCAL_PATH)/../modules/video_render/main/interface \
     $(LOCAL_PATH)/../system_wrappers/interface \
-    $(LOCAL_PATH)/../voice_engine/main/interface
+    $(LOCAL_PATH)/../voice_engine/include
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \

src/video_engine/main/test/android_test/jni/Android.mk

@@ -293,7 +293,7 @@ LOCAL_C_INCLUDES := \
     external/gtest/include \
     $(LOCAL_PATH)/../../../../.. \
     $(LOCAL_PATH)/../../../../include \
-    $(LOCAL_PATH)/../../../../../voice_engine/main/interface
+    $(LOCAL_PATH)/../../../../../voice_engine/include
 
 LOCAL_LDLIBS := \
     -llog \

src/video_engine/test/auto_test/android/jni/Android.mk

@@ -56,7 +56,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../../../../../modules/video_capture/main/source \
     $(LOCAL_PATH)/../../../../../modules/video_coding/codecs/interface \
     $(LOCAL_PATH)/../../../../../modules/video_render/main/interface \
-    $(LOCAL_PATH)/../../../../../voice_engine/main/interface \
+    $(LOCAL_PATH)/../../../../../voice_engine/include \
     $(LOCAL_PATH)/../../../../../system_wrappers/interface 
 
 LOCAL_PRELINK_MODULE := false

src/video_engine/test/auto_test/source/Android.mk

@@ -50,7 +50,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../../../../modules/interface \
     $(LOCAL_PATH)/../../../../modules/video_capture/main/interface \
     $(LOCAL_PATH)/../../../../common_video/vplib/main/interface \
-    $(LOCAL_PATH)/../../../../voice_engine/main/interface
+    $(LOCAL_PATH)/../../../../voice_engine/include
 
 LOCAL_SHARED_LIBRARIES := \
     libutils \

src/video_engine/test/auto_test/source/vie_autotest_capture.cc

@@ -23,7 +23,7 @@
 #include "video_engine/test/auto_test/interface/vie_autotest_defines.h"
 #include "video_engine/test/libvietest/include/tb_interfaces.h"
 #include "video_engine/test/libvietest/include/tb_video_channel.h"
-#include "voice_engine/main/interface/voe_base.h"
+#include "voice_engine/include/voe_base.h"
 
 DEFINE_bool(capture_test_ensure_resolution_alignment_in_capture_device, true,
             "If true, we will give resolutions slightly below a reasonable "

src/video_engine/test/auto_test/source/vie_autotest_codec.cc

@@ -22,7 +22,7 @@
 #include "video_engine/include/vie_network.h"
 #include "video_engine/include/vie_render.h"
 #include "video_engine/include/vie_rtp_rtcp.h"
-#include "voice_engine/main/interface/voe_base.h"
+#include "voice_engine/include/voe_base.h"
 
 class TestCodecObserver
     : public webrtc::ViEEncoderObserver,

src/video_engine/test/auto_test/source/vie_window_creator.cc

@@ -14,7 +14,7 @@
 #include "video_engine/test/auto_test/interface/vie_autotest_main.h"
 #include "video_engine/test/auto_test/interface/vie_autotest_window_manager_interface.h"
 #include "video_engine/test/auto_test/interface/vie_window_manager_factory.h"
-#include "voice_engine/main/interface/voe_codec.h"
+#include "voice_engine/include/voe_codec.h"
 
 #if defined(WIN32)
 #include <tchar.h>

src/video_engine/vie_channel_manager.cc

@@ -20,7 +20,7 @@
 #include "video_engine/vie_defines.h"
 #include "video_engine/vie_encoder.h"
 #include "video_engine/vie_remb.h"
-#include "voice_engine/main/interface/voe_video_sync.h"
+#include "voice_engine/include/voe_video_sync.h"
 
 namespace webrtc {
 

src/video_engine/vie_file_player.cc

@@ -18,9 +18,9 @@
 #include "system_wrappers/interface/trace.h"
 #include "video_engine/include/vie_file.h"
 #include "video_engine/vie_defines.h"
-#include "voice_engine/main/interface/voe_base.h"
-#include "voice_engine/main/interface/voe_file.h"
-#include "voice_engine/main/interface/voe_video_sync.h"
+#include "voice_engine/include/voe_base.h"
+#include "voice_engine/include/voe_file.h"
+#include "voice_engine/include/voe_video_sync.h"
 
 namespace webrtc {
 

src/video_engine/vie_file_recorder.h

@@ -14,7 +14,7 @@
 #include "modules/utility/interface/file_recorder.h"
 #include "typedefs.h"  // NOLINT
 #include "video_engine/include/vie_file.h"
-#include "voice_engine/main/interface/voe_file.h"
+#include "voice_engine/include/voe_file.h"
 
 namespace webrtc {
 

src/video_engine/vie_sync_module.cc

@@ -15,7 +15,7 @@
 #include "system_wrappers/interface/critical_section_wrapper.h"
 #include "system_wrappers/interface/trace.h"
 #include "video_engine/stream_synchronization.h"
-#include "voice_engine/main/interface/voe_video_sync.h"
+#include "voice_engine/include/voe_video_sync.h"
 
 namespace webrtc {
 

src/voice_engine/test/android/android_test/jni/Android.mk

@@ -37,7 +37,7 @@ include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/rtp_rtcp/source
 include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/udp_transport/source/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/modules/utility/source/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/system_wrappers/source/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/voice_engine/main/source/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/voice_engine/Android.mk
 
 LOCAL_PATH := $(call my-dir)
 
@@ -116,7 +116,7 @@ include $(BUILD_SHARED_LIBRARY)
 
 ###
 
-include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/voice_engine/main/test/cmd_test/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/$(MY_WEBRTC_SRC_PATH)/src/voice_engine/test/cmd_test/Android.mk
 
 else
 

src/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/main/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
 
 class AgcConfigTest : public AfterStreamingFixture {
  protected:

src/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/main/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
 
 class EcMetricsTest : public AfterStreamingFixture {
 };

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

@@ -11,9 +11,9 @@
 #include "system_wrappers/interface/critical_section_wrapper.h"
 #include "system_wrappers/interface/event_wrapper.h"
 #include "system_wrappers/interface/thread_wrapper.h"
-#include "voice_engine/main/interface/voe_network.h"
-#include "voice_engine/main/source/voice_engine_defines.h"
-#include "voice_engine/main/test/auto_test/fakes/fake_external_transport.h"
+#include "voice_engine/include/voe_network.h"
+#include "voice_engine/voice_engine_defines.h"
+#include "voice_engine/test/auto_test/fakes/fake_external_transport.h"
 
 FakeExternalTransport::FakeExternalTransport(webrtc::VoENetwork* ptr)
     : my_network_(ptr),

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

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

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

@@ -9,8 +9,8 @@
  */
 
 #include "testsupport/fileutils.h"
-#include "voice_engine/main/test/auto_test/fixtures/after_streaming_fixture.h"
-#include "voice_engine/main/test/auto_test/voe_standard_test.h"
+#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "voice_engine/test/auto_test/voe_standard_test.h"
 
 class RxCallback : public webrtc::VoERxVadCallback {
  public:

src/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/main/interface/voe_encryption.h"
-#include "voice_engine/main/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "voice_engine/include/voe_encryption.h"
+#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
 
 class BasicBitInverseEncryption : public webrtc::Encryption {
   void encrypt(int channel_no, unsigned char* in_data,

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

@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "voice_engine/main/interface/voe_external_media.h"
-#include "voice_engine/main/test/auto_test/fakes/fake_media_process.h"
-#include "voice_engine/main/test/auto_test/fixtures/after_streaming_fixture.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"
 
 class ExternalMediaTest : public AfterStreamingFixture {
  protected:

src/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/main/test/auto_test/fixtures/after_streaming_fixture.h"
+#include "voice_engine/test/auto_test/fixtures/after_streaming_fixture.h"
 
 class NetEQStatsTest : public AfterStreamingFixture {
 };