Include files from webrtc/.. paths in test/channel_transport/

BUG=1662
R=henrikg@webrtc.org

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

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

webrtc/test/channel_transport/channel_transport.cc

@@ -13,12 +13,12 @@
 #include <stdio.h>
 
 #ifndef WEBRTC_ANDROID
-#include "gtest/gtest.h"
+#include "testing/gtest/include/gtest/gtest.h"
 #endif
 #include "webrtc/test/channel_transport/udp_transport.h"
 #include "webrtc/video_engine/include/vie_network.h"
-#include "webrtc/voice_engine/include/voe_network.h"
 #include "webrtc/video_engine/vie_defines.h"
+#include "webrtc/voice_engine/include/voe_network.h"
 
 #ifdef WEBRTC_ANDROID
 #undef NDEBUG

webrtc/test/channel_transport/include/channel_transport.h

@@ -86,4 +86,3 @@ class VideoChannelTransport : public UdpTransportData {
 }  // namespace webrtc
 
 #endif  // WEBRTC_TEST_CHANNEL_TRANSPORT_INCLUDE_CHANNEL_TRANSPORT_H_
-

webrtc/test/channel_transport/udp_socket2_manager_win.h

@@ -24,6 +24,7 @@
 #include "webrtc/system_wrappers/interface/thread_wrapper.h"
 #include "webrtc/test/channel_transport/udp_socket2_win.h"
 #include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h"
+#include "webrtc/test/channel_transport/udp_transport.h"
 
 #define MAX_IO_BUFF_SIZE 1600
 

webrtc/test/channel_transport/udp_socket2_win.h

@@ -26,8 +26,8 @@
 #include "webrtc/system_wrappers/interface/list_wrapper.h"
 #include "webrtc/system_wrappers/interface/rw_lock_wrapper.h"
 #include "webrtc/system_wrappers/interface/trace.h"
-#include "webrtc/test/channel_transport/udp_socket_wrapper.h"
 #include "webrtc/test/channel_transport/udp_socket2_manager_win.h"
+#include "webrtc/test/channel_transport/udp_socket_wrapper.h"
 
 namespace webrtc {
 namespace test {

webrtc/test/channel_transport/udp_socket_manager_posix.cc

@@ -10,12 +10,12 @@
 
 #include "webrtc/test/channel_transport/udp_socket_manager_posix.h"
 
+#include <stdio.h>
 #include <strings.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
-#include <stdio.h>
 
 #include "webrtc/system_wrappers/interface/sleep.h"
 #include "webrtc/system_wrappers/interface/trace.h"

webrtc/test/channel_transport/udp_socket_manager_unittest.cc

@@ -15,10 +15,10 @@
 // It also uses the static UdpSocketManager object.
 // The most important property of these tests is that they do not leak memory.
 
-#include "gtest/gtest.h"
-#include "webrtc/test/channel_transport/udp_socket_wrapper.h"
-#include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h"
+#include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/system_wrappers/interface/trace.h"
+#include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h"
+#include "webrtc/test/channel_transport/udp_socket_wrapper.h"
 
 namespace webrtc {
 namespace test {

webrtc/test/channel_transport/udp_socket_posix.cc

@@ -13,12 +13,12 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
+#include <stdio.h>
 #include <string.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
-#include <stdio.h>
 
 #include "webrtc/system_wrappers/interface/trace.h"
 #include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h"

webrtc/test/channel_transport/udp_socket_posix.h

@@ -13,8 +13,8 @@
 
 #include <arpa/inet.h>
 #include <netinet/in.h>
-#include <sys/types.h>
 #include <sys/socket.h>
+#include <sys/types.h>
 
 #include "webrtc/system_wrappers/interface/condition_variable_wrapper.h"
 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"

webrtc/test/channel_transport/udp_socket_wrapper_unittest.cc

@@ -20,10 +20,10 @@
 // This is done differently in the Winsock2 code, but that code
 // will also hang if the destructor is called directly.
 
-#include "gtest/gtest.h"
-#include "gmock/gmock.h"
-#include "webrtc/test/channel_transport/udp_socket_wrapper.h"
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h"
+#include "webrtc/test/channel_transport/udp_socket_wrapper.h"
 
 using ::testing::_;
 using ::testing::Return;

webrtc/test/channel_transport/udp_transport_impl.cc

@@ -22,8 +22,8 @@
 #include <arpa/inet.h>
 #include <ctype.h>
 #include <fcntl.h>
-#include <netdb.h>
 #include <net/if.h>
+#include <netdb.h>
 #include <netinet/in.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
@@ -45,11 +45,11 @@
 #endif
 
 #include "webrtc/common_types.h"
-#include "webrtc/typedefs.h"
 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
 #include "webrtc/system_wrappers/interface/rw_lock_wrapper.h"
 #include "webrtc/system_wrappers/interface/trace.h"
 #include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h"
+#include "webrtc/typedefs.h"
 
 #if defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
 #define GetLastError() errno

webrtc/test/channel_transport/udp_transport_impl.h

@@ -11,8 +11,8 @@
 #ifndef WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_TRANSPORT_IMPL_H_
 #define WEBRTC_TEST_CHANNEL_TRANSPORT_UDP_TRANSPORT_IMPL_H_
 
-#include "webrtc/test/channel_transport/udp_transport.h"
 #include "webrtc/test/channel_transport/udp_socket_wrapper.h"
+#include "webrtc/test/channel_transport/udp_transport.h"
 
 namespace webrtc {
 

webrtc/test/channel_transport/udp_transport_unittest.cc

@@ -10,8 +10,8 @@
 
 #include <vector>
 
-#include "gmock/gmock.h"
-#include "gtest/gtest.h"
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/test/channel_transport/udp_transport.h"
 // We include the implementation header file to get at the dependency-injecting
 // constructor.