commit 1323fc39babb2638c5795c1e23e97c977c5c29f3
author Henrik Kjellander <kjellander@webrtc.org> Wed Nov 11 10:34:26 2015 +0100
committer Henrik Kjellander <kjellander@webrtc.org> Wed Nov 11 09:34:35 2015 +0000
tree c7d7eba55f614e457602bfd2d68f150218efbe93
parent 5237aaf243d29732f59557361b7a993c0a18cf0e

Remove webrtc/test/channel_transport/include

Move the header file into webrtc/test/channel_transport instead.

BUG=webrtc:5095
TESTED=git cl try -c --bot=android_compile_rel --bot=linux_compile_rel --bot=win_compile_rel --bot=mac_compile_rel -m tryserver.webrtc --bot=ios_rel
R=henrika@webrtc.org, henrikg@webrtc.org

Review URL: https://codereview.webrtc.org/1431983006 .

Cr-Commit-Position: refs/heads/master@{#10595}

webrtc/test/channel_transport/channel_transport.cc

diff --git a/webrtc/test/channel_transport/channel_transport.cc b/webrtc/test/channel_transport/channel_transport.cc
index a8aca35..38eefe5 100644
--- a/webrtc/test/channel_transport/channel_transport.cc
+++ b/webrtc/test/channel_transport/channel_transport.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/test/channel_transport/include/channel_transport.h"
+#include "webrtc/test/channel_transport/channel_transport.h"
 
 #include <stdio.h>
 

webrtc/test/channel_transport/channel_transport.h

diff --git a/webrtc/test/channel_transport/include/channel_transport.h b/webrtc/test/channel_transport/channel_transport.h
similarity index 88%
rename from webrtc/test/channel_transport/include/channel_transport.h
rename to webrtc/test/channel_transport/channel_transport.h
index 8b84517..bab7c59 100644
--- a/webrtc/test/channel_transport/include/channel_transport.h
+++ b/webrtc/test/channel_transport/channel_transport.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_TEST_CHANNEL_TRANSPORT_INCLUDE_CHANNEL_TRANSPORT_H_
-#define WEBRTC_TEST_CHANNEL_TRANSPORT_INCLUDE_CHANNEL_TRANSPORT_H_
+#ifndef WEBRTC_TEST_CHANNEL_TRANSPORT_CHANNEL_TRANSPORT_H_
+#define WEBRTC_TEST_CHANNEL_TRANSPORT_CHANNEL_TRANSPORT_H_
 
 #include "webrtc/test/channel_transport/udp_transport.h"
 
@@ -53,4 +53,4 @@
 }  // namespace test
 }  // namespace webrtc
 
-#endif  // WEBRTC_TEST_CHANNEL_TRANSPORT_INCLUDE_CHANNEL_TRANSPORT_H_
+#endif  // WEBRTC_TEST_CHANNEL_TRANSPORT_CHANNEL_TRANSPORT_H_

webrtc/test/test.gyp

diff --git a/webrtc/test/test.gyp b/webrtc/test/test.gyp
index 0d251df..0af17f7 100644
--- a/webrtc/test/test.gyp
+++ b/webrtc/test/test.gyp
@@ -22,7 +22,7 @@
       ],
       'sources': [
         'channel_transport/channel_transport.cc',
-        'channel_transport/include/channel_transport.h',
+        'channel_transport/channel_transport.h',
         'channel_transport/traffic_control_win.cc',
         'channel_transport/traffic_control_win.h',
         'channel_transport/udp_socket_manager_posix.cc',