From 1e50231ff88801cf87143e8a94612d39ff4c2072 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Mon, 27 May 2013 15:02:23 +0000 Subject: [PATCH] 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 | 4 ++-- webrtc/test/channel_transport/include/channel_transport.h | 1 - webrtc/test/channel_transport/udp_socket2_manager_win.h | 1 + webrtc/test/channel_transport/udp_socket2_win.h | 2 +- webrtc/test/channel_transport/udp_socket_manager_posix.cc | 2 +- .../test/channel_transport/udp_socket_manager_unittest.cc | 6 +++--- webrtc/test/channel_transport/udp_socket_posix.cc | 2 +- webrtc/test/channel_transport/udp_socket_posix.h | 2 +- .../test/channel_transport/udp_socket_wrapper_unittest.cc | 6 +++--- webrtc/test/channel_transport/udp_transport_impl.cc | 4 ++-- webrtc/test/channel_transport/udp_transport_impl.h | 2 +- webrtc/test/channel_transport/udp_transport_unittest.cc | 4 ++-- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/webrtc/test/channel_transport/channel_transport.cc b/webrtc/test/channel_transport/channel_transport.cc index 51f635c426..979163bff6 100644 --- a/webrtc/test/channel_transport/channel_transport.cc +++ b/webrtc/test/channel_transport/channel_transport.cc @@ -13,12 +13,12 @@ #include #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 diff --git a/webrtc/test/channel_transport/include/channel_transport.h b/webrtc/test/channel_transport/include/channel_transport.h index 5208a5c41e..aac4da19e7 100644 --- a/webrtc/test/channel_transport/include/channel_transport.h +++ b/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_ - diff --git a/webrtc/test/channel_transport/udp_socket2_manager_win.h b/webrtc/test/channel_transport/udp_socket2_manager_win.h index 49b0c1178a..758c339b8e 100644 --- a/webrtc/test/channel_transport/udp_socket2_manager_win.h +++ b/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 diff --git a/webrtc/test/channel_transport/udp_socket2_win.h b/webrtc/test/channel_transport/udp_socket2_win.h index b9c4f973ac..0bc3581ead 100644 --- a/webrtc/test/channel_transport/udp_socket2_win.h +++ b/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 { diff --git a/webrtc/test/channel_transport/udp_socket_manager_posix.cc b/webrtc/test/channel_transport/udp_socket_manager_posix.cc index ac30c642d8..18f9ae3848 100644 --- a/webrtc/test/channel_transport/udp_socket_manager_posix.cc +++ b/webrtc/test/channel_transport/udp_socket_manager_posix.cc @@ -10,12 +10,12 @@ #include "webrtc/test/channel_transport/udp_socket_manager_posix.h" +#include #include #include #include #include #include -#include #include "webrtc/system_wrappers/interface/sleep.h" #include "webrtc/system_wrappers/interface/trace.h" diff --git a/webrtc/test/channel_transport/udp_socket_manager_unittest.cc b/webrtc/test/channel_transport/udp_socket_manager_unittest.cc index c1a29a8d72..d8e66b9395 100644 --- a/webrtc/test/channel_transport/udp_socket_manager_unittest.cc +++ b/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 { diff --git a/webrtc/test/channel_transport/udp_socket_posix.cc b/webrtc/test/channel_transport/udp_socket_posix.cc index eaf36fc0bd..530000b73a 100644 --- a/webrtc/test/channel_transport/udp_socket_posix.cc +++ b/webrtc/test/channel_transport/udp_socket_posix.cc @@ -13,12 +13,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include "webrtc/system_wrappers/interface/trace.h" #include "webrtc/test/channel_transport/udp_socket_manager_wrapper.h" diff --git a/webrtc/test/channel_transport/udp_socket_posix.h b/webrtc/test/channel_transport/udp_socket_posix.h index 68e0f8ee8c..8eb06ee4b1 100644 --- a/webrtc/test/channel_transport/udp_socket_posix.h +++ b/webrtc/test/channel_transport/udp_socket_posix.h @@ -13,8 +13,8 @@ #include #include -#include #include +#include #include "webrtc/system_wrappers/interface/condition_variable_wrapper.h" #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" diff --git a/webrtc/test/channel_transport/udp_socket_wrapper_unittest.cc b/webrtc/test/channel_transport/udp_socket_wrapper_unittest.cc index 22757d1e3f..12fb6fa582 100644 --- a/webrtc/test/channel_transport/udp_socket_wrapper_unittest.cc +++ b/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; diff --git a/webrtc/test/channel_transport/udp_transport_impl.cc b/webrtc/test/channel_transport/udp_transport_impl.cc index ec73200e32..8b974c84c8 100644 --- a/webrtc/test/channel_transport/udp_transport_impl.cc +++ b/webrtc/test/channel_transport/udp_transport_impl.cc @@ -22,8 +22,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -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 diff --git a/webrtc/test/channel_transport/udp_transport_impl.h b/webrtc/test/channel_transport/udp_transport_impl.h index e60416130c..dc226de86c 100644 --- a/webrtc/test/channel_transport/udp_transport_impl.h +++ b/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 { diff --git a/webrtc/test/channel_transport/udp_transport_unittest.cc b/webrtc/test/channel_transport/udp_transport_unittest.cc index d1bbb1dfc3..5ccc9ef2b8 100644 --- a/webrtc/test/channel_transport/udp_transport_unittest.cc +++ b/webrtc/test/channel_transport/udp_transport_unittest.cc @@ -10,8 +10,8 @@ #include -#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.