Fixing WebRTC after moving from src/webrtc to src/
In https://webrtc-review.googlesource.com/c/src/+/1560 we moved WebRTC
from src/webrtc to src/ (in order to preserve an healthy git history).
This CL takes care of fixing header guards, #include paths, etc...
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
TBR=tommi@webrtc.org
Bug: chromium:611808
Change-Id: Iea91618212bee0af16aa3f05071eab8f93706578
Reviewed-on: https://webrtc-review.googlesource.com/1561
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Henrik Kjellander <kjellander@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#19846}diff --git a/test/BUILD.gn b/test/BUILD.gn
index dc696c4..f603733 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -265,13 +265,13 @@
}
test_support_unittests_resources = [
- "../../resources/foreman_cif_short.yuv",
- "../../resources/video_coding/frame-ethernet-ii.pcap",
- "../../resources/video_coding/frame-loopback.pcap",
- "../../resources/video_coding/pltype103.rtp",
- "../../resources/video_coding/pltype103_header_only.rtp",
- "../../resources/video_coding/ssrcs-2.pcap",
- "../../resources/video_coding/ssrcs-3.pcap",
+ "../resources/foreman_cif_short.yuv",
+ "../resources/video_coding/frame-ethernet-ii.pcap",
+ "../resources/video_coding/frame-loopback.pcap",
+ "../resources/video_coding/pltype103.rtp",
+ "../resources/video_coding/pltype103_header_only.rtp",
+ "../resources/video_coding/ssrcs-2.pcap",
+ "../resources/video_coding/ssrcs-3.pcap",
]
if (is_ios) {
diff --git a/test/DEPS b/test/DEPS
index 5aaae76..39f107b 100644
--- a/test/DEPS
+++ b/test/DEPS
@@ -1,22 +1,22 @@
include_rules = [
"+third_party/libjpeg",
"+third_party/libjpeg_turbo",
- "+webrtc/call",
- "+webrtc/common_audio",
- "+webrtc/common_video",
- "+webrtc/logging/rtc_event_log",
- "+webrtc/media/base",
- "+webrtc/modules/audio_coding",
- "+webrtc/modules/audio_device",
- "+webrtc/modules/audio_mixer",
- "+webrtc/modules/audio_processing",
- "+webrtc/modules/media_file",
- "+webrtc/modules/rtp_rtcp",
- "+webrtc/modules/video_capture",
- "+webrtc/modules/video_coding",
- "+webrtc/sdk",
- "+webrtc/system_wrappers",
- "+webrtc/voice_engine",
+ "+call",
+ "+common_audio",
+ "+common_video",
+ "+logging/rtc_event_log",
+ "+media/base",
+ "+modules/audio_coding",
+ "+modules/audio_device",
+ "+modules/audio_mixer",
+ "+modules/audio_processing",
+ "+modules/media_file",
+ "+modules/rtp_rtcp",
+ "+modules/video_capture",
+ "+modules/video_coding",
+ "+sdk",
+ "+system_wrappers",
+ "+voice_engine",
]
specific_include_rules = {
@@ -27,17 +27,17 @@
"+testing/gtest/include/gtest",
],
".*congestion_controller_feedback_fuzzer\.cc": [
- "+webrtc/modules/congestion_controller/include/receive_side_congestion_controller.h",
- "+webrtc/modules/pacing/packet_router.h",
- "+webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h",
+ "+modules/congestion_controller/include/receive_side_congestion_controller.h",
+ "+modules/pacing/packet_router.h",
+ "+modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h",
],
".*pseudotcp_parser_fuzzer\.cc": [
- "+webrtc/p2p/base/pseudotcp.h",
+ "+p2p/base/pseudotcp.h",
],
".*stun_parser_fuzzer\.cc": [
- "+webrtc/p2p/base/stun.h",
+ "+p2p/base/stun.h",
],
".*stun_validator_fuzzer\.cc": [
- "+webrtc/p2p/base/stun.h",
+ "+p2p/base/stun.h",
],
}
diff --git a/test/call_test.cc b/test/call_test.cc
index d4084d5..3c9540a 100644
--- a/test/call_test.cc
+++ b/test/call_test.cc
@@ -8,20 +8,20 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/call_test.h"
+#include "test/call_test.h"
#include <algorithm>
-#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
-#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h"
-#include "webrtc/call/rtp_transport_controller_send.h"
-#include "webrtc/call/video_config.h"
-#include "webrtc/modules/audio_mixer/audio_mixer_impl.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/event.h"
-#include "webrtc/rtc_base/ptr_util.h"
-#include "webrtc/test/testsupport/fileutils.h"
-#include "webrtc/voice_engine/include/voe_base.h"
+#include "api/audio_codecs/builtin_audio_decoder_factory.h"
+#include "api/audio_codecs/builtin_audio_encoder_factory.h"
+#include "call/rtp_transport_controller_send.h"
+#include "call/video_config.h"
+#include "modules/audio_mixer/audio_mixer_impl.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/event.h"
+#include "rtc_base/ptr_util.h"
+#include "test/testsupport/fileutils.h"
+#include "voice_engine/include/voe_base.h"
namespace webrtc {
namespace test {
diff --git a/test/call_test.h b/test/call_test.h
index 3372015..cf15aac 100644
--- a/test/call_test.h
+++ b/test/call_test.h
@@ -7,23 +7,23 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_CALL_TEST_H_
-#define WEBRTC_TEST_CALL_TEST_H_
+#ifndef TEST_CALL_TEST_H_
+#define TEST_CALL_TEST_H_
#include <memory>
#include <vector>
-#include "webrtc/call/call.h"
-#include "webrtc/call/rtp_transport_controller_send.h"
-#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
-#include "webrtc/test/encoder_settings.h"
-#include "webrtc/test/fake_audio_device.h"
-#include "webrtc/test/fake_decoder.h"
-#include "webrtc/test/fake_encoder.h"
-#include "webrtc/test/fake_videorenderer.h"
-#include "webrtc/test/frame_generator_capturer.h"
-#include "webrtc/test/rtp_rtcp_observer.h"
-#include "webrtc/test/single_threaded_task_queue.h"
+#include "call/call.h"
+#include "call/rtp_transport_controller_send.h"
+#include "logging/rtc_event_log/rtc_event_log.h"
+#include "test/encoder_settings.h"
+#include "test/fake_audio_device.h"
+#include "test/fake_decoder.h"
+#include "test/fake_encoder.h"
+#include "test/fake_videorenderer.h"
+#include "test/frame_generator_capturer.h"
+#include "test/rtp_rtcp_observer.h"
+#include "test/single_threaded_task_queue.h"
namespace webrtc {
@@ -246,4 +246,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_CALL_TEST_H_
+#endif // TEST_CALL_TEST_H_
diff --git a/test/configurable_frame_size_encoder.cc b/test/configurable_frame_size_encoder.cc
index c81833f..cbfb35b 100644
--- a/test/configurable_frame_size_encoder.cc
+++ b/test/configurable_frame_size_encoder.cc
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/configurable_frame_size_encoder.h"
+#include "test/configurable_frame_size_encoder.h"
#include <string.h>
-#include "webrtc/common_video/include/video_frame.h"
-#include "webrtc/modules/video_coding/include/video_codec_interface.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/test/gtest.h"
+#include "common_video/include/video_frame.h"
+#include "modules/video_coding/include/video_codec_interface.h"
+#include "rtc_base/checks.h"
+#include "test/gtest.h"
namespace webrtc {
namespace test {
diff --git a/test/configurable_frame_size_encoder.h b/test/configurable_frame_size_encoder.h
index 886c546..8d3cbc6 100644
--- a/test/configurable_frame_size_encoder.h
+++ b/test/configurable_frame_size_encoder.h
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_CONFIGURABLE_FRAME_SIZE_ENCODER_H_
-#define WEBRTC_TEST_CONFIGURABLE_FRAME_SIZE_ENCODER_H_
+#ifndef TEST_CONFIGURABLE_FRAME_SIZE_ENCODER_H_
+#define TEST_CONFIGURABLE_FRAME_SIZE_ENCODER_H_
#include <memory>
#include <vector>
-#include "webrtc/api/video_codecs/video_encoder.h"
+#include "api/video_codecs/video_encoder.h"
namespace webrtc {
namespace test {
@@ -56,4 +56,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_CONFIGURABLE_FRAME_SIZE_ENCODER_H_
+#endif // TEST_CONFIGURABLE_FRAME_SIZE_ENCODER_H_
diff --git a/test/constants.cc b/test/constants.cc
index 3faa83a..1a010c5 100644
--- a/test/constants.cc
+++ b/test/constants.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/constants.h"
+#include "test/constants.h"
namespace webrtc {
namespace test {
diff --git a/test/direct_transport.cc b/test/direct_transport.cc
index 35f3f92..44f7532 100644
--- a/test/direct_transport.cc
+++ b/test/direct_transport.cc
@@ -7,12 +7,12 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/direct_transport.h"
+#include "test/direct_transport.h"
-#include "webrtc/call/call.h"
-#include "webrtc/rtc_base/ptr_util.h"
-#include "webrtc/system_wrappers/include/clock.h"
-#include "webrtc/test/single_threaded_task_queue.h"
+#include "call/call.h"
+#include "rtc_base/ptr_util.h"
+#include "system_wrappers/include/clock.h"
+#include "test/single_threaded_task_queue.h"
namespace webrtc {
namespace test {
diff --git a/test/direct_transport.h b/test/direct_transport.h
index c60157d..68a1968 100644
--- a/test/direct_transport.h
+++ b/test/direct_transport.h
@@ -7,19 +7,19 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_DIRECT_TRANSPORT_H_
-#define WEBRTC_TEST_DIRECT_TRANSPORT_H_
+#ifndef TEST_DIRECT_TRANSPORT_H_
+#define TEST_DIRECT_TRANSPORT_H_
#include <assert.h>
#include <memory>
-#include "webrtc/api/call/transport.h"
-#include "webrtc/call/call.h"
-#include "webrtc/rtc_base/sequenced_task_checker.h"
-#include "webrtc/rtc_base/thread_annotations.h"
-#include "webrtc/test/fake_network_pipe.h"
-#include "webrtc/test/single_threaded_task_queue.h"
+#include "api/call/transport.h"
+#include "call/call.h"
+#include "rtc_base/sequenced_task_checker.h"
+#include "rtc_base/thread_annotations.h"
+#include "test/fake_network_pipe.h"
+#include "test/single_threaded_task_queue.h"
namespace webrtc {
@@ -79,4 +79,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_DIRECT_TRANSPORT_H_
+#endif // TEST_DIRECT_TRANSPORT_H_
diff --git a/test/drifting_clock.cc b/test/drifting_clock.cc
index c1539fd..5333e1d 100644
--- a/test/drifting_clock.cc
+++ b/test/drifting_clock.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/drifting_clock.h"
-#include "webrtc/rtc_base/checks.h"
+#include "test/drifting_clock.h"
+#include "rtc_base/checks.h"
namespace webrtc {
namespace test {
diff --git a/test/drifting_clock.h b/test/drifting_clock.h
index 43708da..a0ba93e 100644
--- a/test/drifting_clock.h
+++ b/test/drifting_clock.h
@@ -7,10 +7,10 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_DRIFTING_CLOCK_H_
-#define WEBRTC_TEST_DRIFTING_CLOCK_H_
+#ifndef TEST_DRIFTING_CLOCK_H_
+#define TEST_DRIFTING_CLOCK_H_
-#include "webrtc/system_wrappers/include/clock.h"
+#include "system_wrappers/include/clock.h"
namespace webrtc {
namespace test {
@@ -42,4 +42,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_DRIFTING_CLOCK_H_
+#endif // TEST_DRIFTING_CLOCK_H_
diff --git a/test/encoder_settings.cc b/test/encoder_settings.cc
index 570fff5..a2549ab 100644
--- a/test/encoder_settings.cc
+++ b/test/encoder_settings.cc
@@ -7,15 +7,15 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/encoder_settings.h"
+#include "test/encoder_settings.h"
#include <algorithm>
#include <string>
-#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
-#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
-#include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
-#include "webrtc/test/fake_decoder.h"
+#include "modules/video_coding/codecs/h264/include/h264.h"
+#include "modules/video_coding/codecs/vp8/include/vp8.h"
+#include "modules/video_coding/codecs/vp9/include/vp9.h"
+#include "test/fake_decoder.h"
namespace webrtc {
namespace test {
diff --git a/test/encoder_settings.h b/test/encoder_settings.h
index 4c4fa4e..25cfa29 100644
--- a/test/encoder_settings.h
+++ b/test/encoder_settings.h
@@ -7,13 +7,13 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_ENCODER_SETTINGS_H_
-#define WEBRTC_TEST_ENCODER_SETTINGS_H_
+#ifndef TEST_ENCODER_SETTINGS_H_
+#define TEST_ENCODER_SETTINGS_H_
#include <vector>
-#include "webrtc/call/video_receive_stream.h"
-#include "webrtc/call/video_send_stream.h"
+#include "call/video_receive_stream.h"
+#include "call/video_send_stream.h"
namespace webrtc {
namespace test {
@@ -53,4 +53,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_ENCODER_SETTINGS_H_
+#endif // TEST_ENCODER_SETTINGS_H_
diff --git a/test/fake_audio_device.cc b/test/fake_audio_device.cc
index 97299e1..eef8bfd 100644
--- a/test/fake_audio_device.cc
+++ b/test/fake_audio_device.cc
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/fake_audio_device.h"
+#include "test/fake_audio_device.h"
#include <algorithm>
#include <utility>
-#include "webrtc/common_audio/wav_file.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/random.h"
-#include "webrtc/system_wrappers/include/event_wrapper.h"
+#include "common_audio/wav_file.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/random.h"
+#include "system_wrappers/include/event_wrapper.h"
namespace webrtc {
diff --git a/test/fake_audio_device.h b/test/fake_audio_device.h
index 939d16a..4847275 100644
--- a/test/fake_audio_device.h
+++ b/test/fake_audio_device.h
@@ -7,20 +7,20 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_FAKE_AUDIO_DEVICE_H_
-#define WEBRTC_TEST_FAKE_AUDIO_DEVICE_H_
+#ifndef TEST_FAKE_AUDIO_DEVICE_H_
+#define TEST_FAKE_AUDIO_DEVICE_H_
#include <memory>
#include <string>
#include <vector>
-#include "webrtc/api/array_view.h"
-#include "webrtc/modules/audio_device/include/fake_audio_device.h"
-#include "webrtc/rtc_base/buffer.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/event.h"
-#include "webrtc/rtc_base/platform_thread.h"
-#include "webrtc/typedefs.h"
+#include "api/array_view.h"
+#include "modules/audio_device/include/fake_audio_device.h"
+#include "rtc_base/buffer.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/event.h"
+#include "rtc_base/platform_thread.h"
+#include "typedefs.h"
namespace webrtc {
@@ -141,4 +141,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_FAKE_AUDIO_DEVICE_H_
+#endif // TEST_FAKE_AUDIO_DEVICE_H_
diff --git a/test/fake_audio_device_unittest.cc b/test/fake_audio_device_unittest.cc
index d4f8acc..02ece3c 100644
--- a/test/fake_audio_device_unittest.cc
+++ b/test/fake_audio_device_unittest.cc
@@ -11,11 +11,11 @@
#include <algorithm>
#include <array>
-#include "webrtc/common_audio/wav_file.h"
-#include "webrtc/common_audio/wav_header.h"
-#include "webrtc/test/fake_audio_device.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/test/testsupport/fileutils.h"
+#include "common_audio/wav_file.h"
+#include "common_audio/wav_header.h"
+#include "test/fake_audio_device.h"
+#include "test/gtest.h"
+#include "test/testsupport/fileutils.h"
namespace webrtc {
namespace test {
diff --git a/test/fake_decoder.cc b/test/fake_decoder.cc
index f2823b5..fe8aef7 100644
--- a/test/fake_decoder.cc
+++ b/test/fake_decoder.cc
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/fake_decoder.h"
+#include "test/fake_decoder.h"
-#include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/rtc_base/timeutils.h"
-#include "webrtc/test/gtest.h"
+#include "api/video/i420_buffer.h"
+#include "rtc_base/timeutils.h"
+#include "test/gtest.h"
namespace webrtc {
namespace test {
diff --git a/test/fake_decoder.h b/test/fake_decoder.h
index b3120a0..61dacf0 100644
--- a/test/fake_decoder.h
+++ b/test/fake_decoder.h
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_FAKE_DECODER_H_
-#define WEBRTC_TEST_FAKE_DECODER_H_
+#ifndef TEST_FAKE_DECODER_H_
+#define TEST_FAKE_DECODER_H_
#include <vector>
-#include "webrtc/modules/video_coding/include/video_codec_interface.h"
-#include "webrtc/system_wrappers/include/clock.h"
+#include "modules/video_coding/include/video_codec_interface.h"
+#include "system_wrappers/include/clock.h"
namespace webrtc {
namespace test {
@@ -73,4 +73,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_FAKE_DECODER_H_
+#endif // TEST_FAKE_DECODER_H_
diff --git a/test/fake_encoder.cc b/test/fake_encoder.cc
index 7c0870e..1dfc03a 100644
--- a/test/fake_encoder.cc
+++ b/test/fake_encoder.cc
@@ -8,18 +8,18 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/fake_encoder.h"
+#include "test/fake_encoder.h"
#include <string.h>
#include <algorithm>
#include <memory>
-#include "webrtc/common_types.h"
-#include "webrtc/modules/video_coding/include/video_codec_interface.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/system_wrappers/include/sleep.h"
-#include "webrtc/test/gtest.h"
+#include "common_types.h"
+#include "modules/video_coding/include/video_codec_interface.h"
+#include "rtc_base/checks.h"
+#include "system_wrappers/include/sleep.h"
+#include "test/gtest.h"
namespace webrtc {
namespace test {
diff --git a/test/fake_encoder.h b/test/fake_encoder.h
index c8912a1..a9f9650 100644
--- a/test/fake_encoder.h
+++ b/test/fake_encoder.h
@@ -8,18 +8,18 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_FAKE_ENCODER_H_
-#define WEBRTC_TEST_FAKE_ENCODER_H_
+#ifndef TEST_FAKE_ENCODER_H_
+#define TEST_FAKE_ENCODER_H_
#include <vector>
#include <memory>
-#include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/common_types.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/sequenced_task_checker.h"
-#include "webrtc/rtc_base/task_queue.h"
-#include "webrtc/system_wrappers/include/clock.h"
+#include "api/video_codecs/video_encoder.h"
+#include "common_types.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/sequenced_task_checker.h"
+#include "rtc_base/task_queue.h"
+#include "system_wrappers/include/clock.h"
namespace webrtc {
namespace test {
@@ -134,4 +134,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_FAKE_ENCODER_H_
+#endif // TEST_FAKE_ENCODER_H_
diff --git a/test/fake_network_pipe.cc b/test/fake_network_pipe.cc
index 61ac918..66e8997 100644
--- a/test/fake_network_pipe.cc
+++ b/test/fake_network_pipe.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/fake_network_pipe.h"
+#include "test/fake_network_pipe.h"
#include <assert.h>
#include <math.h>
@@ -17,10 +17,10 @@
#include <algorithm>
#include <cmath>
-#include "webrtc/call/call.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/system_wrappers/include/clock.h"
+#include "call/call.h"
+#include "modules/rtp_rtcp/include/rtp_header_parser.h"
+#include "rtc_base/logging.h"
+#include "system_wrappers/include/clock.h"
namespace webrtc {
diff --git a/test/fake_network_pipe.h b/test/fake_network_pipe.h
index d7e0c5d..5ef4509 100644
--- a/test/fake_network_pipe.h
+++ b/test/fake_network_pipe.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_FAKE_NETWORK_PIPE_H_
-#define WEBRTC_TEST_FAKE_NETWORK_PIPE_H_
+#ifndef TEST_FAKE_NETWORK_PIPE_H_
+#define TEST_FAKE_NETWORK_PIPE_H_
#include <string.h>
#include <map>
@@ -17,11 +17,11 @@
#include <queue>
#include <set>
-#include "webrtc/common_types.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/random.h"
-#include "webrtc/typedefs.h"
+#include "common_types.h"
+#include "rtc_base/constructormagic.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/random.h"
+#include "typedefs.h"
namespace webrtc {
@@ -183,4 +183,4 @@
} // namespace webrtc
-#endif // WEBRTC_TEST_FAKE_NETWORK_PIPE_H_
+#endif // TEST_FAKE_NETWORK_PIPE_H_
diff --git a/test/fake_network_pipe_unittest.cc b/test/fake_network_pipe_unittest.cc
index 92619e1..759003b 100644
--- a/test/fake_network_pipe_unittest.cc
+++ b/test/fake_network_pipe_unittest.cc
@@ -10,12 +10,12 @@
#include <memory>
-#include "webrtc/call/call.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
-#include "webrtc/system_wrappers/include/clock.h"
-#include "webrtc/test/fake_network_pipe.h"
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
+#include "call/call.h"
+#include "modules/rtp_rtcp/include/rtp_header_parser.h"
+#include "system_wrappers/include/clock.h"
+#include "test/fake_network_pipe.h"
+#include "test/gmock.h"
+#include "test/gtest.h"
using ::testing::_;
using ::testing::AnyNumber;
diff --git a/test/fake_texture_frame.cc b/test/fake_texture_frame.cc
index a73380d..4c4ea94 100644
--- a/test/fake_texture_frame.cc
+++ b/test/fake_texture_frame.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/fake_texture_frame.h"
+#include "test/fake_texture_frame.h"
namespace webrtc {
namespace test {
diff --git a/test/fake_texture_frame.h b/test/fake_texture_frame.h
index ce5963e..17261ff 100644
--- a/test/fake_texture_frame.h
+++ b/test/fake_texture_frame.h
@@ -7,13 +7,13 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_FAKE_TEXTURE_FRAME_H_
-#define WEBRTC_TEST_FAKE_TEXTURE_FRAME_H_
+#ifndef TEST_FAKE_TEXTURE_FRAME_H_
+#define TEST_FAKE_TEXTURE_FRAME_H_
-#include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/api/video/video_frame.h"
-#include "webrtc/common_video/include/video_frame_buffer.h"
-#include "webrtc/rtc_base/checks.h"
+#include "api/video/i420_buffer.h"
+#include "api/video/video_frame.h"
+#include "common_video/include/video_frame_buffer.h"
+#include "rtc_base/checks.h"
namespace webrtc {
namespace test {
@@ -45,4 +45,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_FAKE_TEXTURE_FRAME_H_
+#endif // TEST_FAKE_TEXTURE_FRAME_H_
diff --git a/test/fake_videorenderer.h b/test/fake_videorenderer.h
index 6a4015d..bc9c1db 100644
--- a/test/fake_videorenderer.h
+++ b/test/fake_videorenderer.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_FAKE_VIDEORENDERER_H_
-#define WEBRTC_TEST_FAKE_VIDEORENDERER_H_
+#ifndef TEST_FAKE_VIDEORENDERER_H_
+#define TEST_FAKE_VIDEORENDERER_H_
-#include "webrtc/api/video/video_frame.h"
-#include "webrtc/media/base/videosinkinterface.h"
+#include "api/video/video_frame.h"
+#include "media/base/videosinkinterface.h"
namespace webrtc {
namespace test {
@@ -25,4 +25,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_FAKE_VIDEORENDERER_H_
+#endif // TEST_FAKE_VIDEORENDERER_H_
diff --git a/test/field_trial.cc b/test/field_trial.cc
index c40d078..57c18f7 100644
--- a/test/field_trial.cc
+++ b/test/field_trial.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/field_trial.h"
+#include "test/field_trial.h"
#include <algorithm>
#include <cassert>
@@ -17,8 +17,8 @@
#include <map>
#include <string>
-#include "webrtc/system_wrappers/include/field_trial.h"
-#include "webrtc/system_wrappers/include/field_trial_default.h"
+#include "system_wrappers/include/field_trial.h"
+#include "system_wrappers/include/field_trial_default.h"
namespace webrtc {
namespace {
diff --git a/test/field_trial.h b/test/field_trial.h
index 735aa1f..99ace4e 100644
--- a/test/field_trial.h
+++ b/test/field_trial.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_FIELD_TRIAL_H_
-#define WEBRTC_TEST_FIELD_TRIAL_H_
+#ifndef TEST_FIELD_TRIAL_H_
+#define TEST_FIELD_TRIAL_H_
#include <string>
#include <map>
@@ -46,4 +46,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_FIELD_TRIAL_H_
+#endif // TEST_FIELD_TRIAL_H_
diff --git a/test/frame_generator.cc b/test/frame_generator.cc
index eff2ec2..d2d580a 100644
--- a/test/frame_generator.cc
+++ b/test/frame_generator.cc
@@ -7,7 +7,7 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/frame_generator.h"
+#include "test/frame_generator.h"
#include <math.h>
#include <stdio.h>
@@ -15,14 +15,14 @@
#include <memory>
-#include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/common_video/include/video_frame_buffer.h"
-#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/keep_ref_until_done.h"
-#include "webrtc/rtc_base/random.h"
-#include "webrtc/system_wrappers/include/clock.h"
-#include "webrtc/test/frame_utils.h"
+#include "api/video/i420_buffer.h"
+#include "common_video/include/video_frame_buffer.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/keep_ref_until_done.h"
+#include "rtc_base/random.h"
+#include "system_wrappers/include/clock.h"
+#include "test/frame_utils.h"
namespace webrtc {
namespace test {
diff --git a/test/frame_generator.h b/test/frame_generator.h
index d42f226..58b8a2b 100644
--- a/test/frame_generator.h
+++ b/test/frame_generator.h
@@ -7,17 +7,17 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_FRAME_GENERATOR_H_
-#define WEBRTC_TEST_FRAME_GENERATOR_H_
+#ifndef TEST_FRAME_GENERATOR_H_
+#define TEST_FRAME_GENERATOR_H_
#include <memory>
#include <string>
#include <vector>
-#include "webrtc/api/video/video_frame.h"
-#include "webrtc/media/base/videosourceinterface.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/typedefs.h"
+#include "api/video/video_frame.h"
+#include "media/base/videosourceinterface.h"
+#include "rtc_base/criticalsection.h"
+#include "typedefs.h"
namespace webrtc {
class Clock;
@@ -98,4 +98,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_FRAME_GENERATOR_H_
+#endif // TEST_FRAME_GENERATOR_H_
diff --git a/test/frame_generator_capturer.cc b/test/frame_generator_capturer.cc
index 095a2043..532e907 100644
--- a/test/frame_generator_capturer.cc
+++ b/test/frame_generator_capturer.cc
@@ -8,19 +8,19 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/frame_generator_capturer.h"
+#include "test/frame_generator_capturer.h"
#include <utility>
#include <vector>
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/platform_thread.h"
-#include "webrtc/rtc_base/task_queue.h"
-#include "webrtc/rtc_base/timeutils.h"
-#include "webrtc/system_wrappers/include/clock.h"
-#include "webrtc/test/frame_generator.h"
-#include "webrtc/call/video_send_stream.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/platform_thread.h"
+#include "rtc_base/task_queue.h"
+#include "rtc_base/timeutils.h"
+#include "system_wrappers/include/clock.h"
+#include "test/frame_generator.h"
+#include "call/video_send_stream.h"
namespace webrtc {
namespace test {
diff --git a/test/frame_generator_capturer.h b/test/frame_generator_capturer.h
index 8f3232c..3373393 100644
--- a/test/frame_generator_capturer.h
+++ b/test/frame_generator_capturer.h
@@ -7,17 +7,17 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_FRAME_GENERATOR_CAPTURER_H_
-#define WEBRTC_TEST_FRAME_GENERATOR_CAPTURER_H_
+#ifndef TEST_FRAME_GENERATOR_CAPTURER_H_
+#define TEST_FRAME_GENERATOR_CAPTURER_H_
#include <memory>
#include <string>
-#include "webrtc/api/video/video_frame.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/task_queue.h"
-#include "webrtc/test/video_capturer.h"
-#include "webrtc/typedefs.h"
+#include "api/video/video_frame.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/task_queue.h"
+#include "test/video_capturer.h"
+#include "typedefs.h"
namespace webrtc {
@@ -105,4 +105,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_FRAME_GENERATOR_CAPTURER_H_
+#endif // TEST_FRAME_GENERATOR_CAPTURER_H_
diff --git a/test/frame_generator_unittest.cc b/test/frame_generator_unittest.cc
index 79e7b63..ba4627d 100644
--- a/test/frame_generator_unittest.cc
+++ b/test/frame_generator_unittest.cc
@@ -13,9 +13,9 @@
#include <memory>
#include <string>
-#include "webrtc/test/frame_generator.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/test/testsupport/fileutils.h"
+#include "test/frame_generator.h"
+#include "test/gtest.h"
+#include "test/testsupport/fileutils.h"
namespace webrtc {
namespace test {
diff --git a/test/frame_utils.cc b/test/frame_utils.cc
index bc8ec4b..1d5fe7c 100644
--- a/test/frame_utils.cc
+++ b/test/frame_utils.cc
@@ -11,9 +11,9 @@
#include <stdio.h>
#include <string.h>
-#include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/api/video/video_frame.h"
-#include "webrtc/test/frame_utils.h"
+#include "api/video/i420_buffer.h"
+#include "api/video/video_frame.h"
+#include "test/frame_utils.h"
namespace webrtc {
namespace test {
diff --git a/test/frame_utils.h b/test/frame_utils.h
index 4953db4..80466e1 100644
--- a/test/frame_utils.h
+++ b/test/frame_utils.h
@@ -7,12 +7,12 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_FRAME_UTILS_H_
-#define WEBRTC_TEST_FRAME_UTILS_H_
+#ifndef TEST_FRAME_UTILS_H_
+#define TEST_FRAME_UTILS_H_
#include <stdint.h>
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "rtc_base/scoped_ref_ptr.h"
namespace webrtc {
class I420Buffer;
@@ -45,4 +45,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_FRAME_UTILS_H_
+#endif // TEST_FRAME_UTILS_H_
diff --git a/test/fuzzers/audio_decoder_fuzzer.cc b/test/fuzzers/audio_decoder_fuzzer.cc
index 441b12b..f6ac4cb 100644
--- a/test/fuzzers/audio_decoder_fuzzer.cc
+++ b/test/fuzzers/audio_decoder_fuzzer.cc
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/fuzzers/audio_decoder_fuzzer.h"
+#include "test/fuzzers/audio_decoder_fuzzer.h"
#include <limits>
-#include "webrtc/api/audio_codecs/audio_decoder.h"
-#include "webrtc/api/optional.h"
-#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
-#include "webrtc/rtc_base/checks.h"
+#include "api/audio_codecs/audio_decoder.h"
+#include "api/optional.h"
+#include "modules/rtp_rtcp/source/byte_io.h"
+#include "rtc_base/checks.h"
namespace webrtc {
namespace {
diff --git a/test/fuzzers/audio_decoder_fuzzer.h b/test/fuzzers/audio_decoder_fuzzer.h
index 29179eb..9079fc2 100644
--- a/test/fuzzers/audio_decoder_fuzzer.h
+++ b/test/fuzzers/audio_decoder_fuzzer.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_FUZZERS_AUDIO_DECODER_FUZZER_H_
-#define WEBRTC_TEST_FUZZERS_AUDIO_DECODER_FUZZER_H_
+#ifndef TEST_FUZZERS_AUDIO_DECODER_FUZZER_H_
+#define TEST_FUZZERS_AUDIO_DECODER_FUZZER_H_
#include <stddef.h>
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
namespace webrtc {
@@ -37,4 +37,4 @@
AudioDecoder* decoder);
} // namespace webrtc
-#endif // WEBRTC_TEST_FUZZERS_AUDIO_DECODER_FUZZER_H_
+#endif // TEST_FUZZERS_AUDIO_DECODER_FUZZER_H_
diff --git a/test/fuzzers/audio_decoder_ilbc_fuzzer.cc b/test/fuzzers/audio_decoder_ilbc_fuzzer.cc
index fbc9d66..a68725d 100644
--- a/test/fuzzers/audio_decoder_ilbc_fuzzer.cc
+++ b/test/fuzzers/audio_decoder_ilbc_fuzzer.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h"
-#include "webrtc/test/fuzzers/audio_decoder_fuzzer.h"
+#include "modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h"
+#include "test/fuzzers/audio_decoder_fuzzer.h"
namespace webrtc {
void FuzzOneInput(const uint8_t* data, size_t size) {
diff --git a/test/fuzzers/audio_decoder_isac_fuzzer.cc b/test/fuzzers/audio_decoder_isac_fuzzer.cc
index 1022776..e79996e 100644
--- a/test/fuzzers/audio_decoder_isac_fuzzer.cc
+++ b/test/fuzzers/audio_decoder_isac_fuzzer.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h"
-#include "webrtc/test/fuzzers/audio_decoder_fuzzer.h"
+#include "modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h"
+#include "test/fuzzers/audio_decoder_fuzzer.h"
namespace webrtc {
void FuzzOneInput(const uint8_t* data, size_t size) {
diff --git a/test/fuzzers/audio_decoder_isac_incoming_packet_fuzzer.cc b/test/fuzzers/audio_decoder_isac_incoming_packet_fuzzer.cc
index 9acebbb..5645142 100644
--- a/test/fuzzers/audio_decoder_isac_incoming_packet_fuzzer.cc
+++ b/test/fuzzers/audio_decoder_isac_incoming_packet_fuzzer.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h"
-#include "webrtc/test/fuzzers/audio_decoder_fuzzer.h"
+#include "modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h"
+#include "test/fuzzers/audio_decoder_fuzzer.h"
namespace webrtc {
void FuzzOneInput(const uint8_t* data, size_t size) {
diff --git a/test/fuzzers/audio_decoder_isacfix_fuzzer.cc b/test/fuzzers/audio_decoder_isacfix_fuzzer.cc
index 64cdccb..444395b 100644
--- a/test/fuzzers/audio_decoder_isacfix_fuzzer.cc
+++ b/test/fuzzers/audio_decoder_isacfix_fuzzer.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h"
-#include "webrtc/test/fuzzers/audio_decoder_fuzzer.h"
+#include "modules/audio_coding/codecs/isac/fix/include/audio_decoder_isacfix.h"
+#include "test/fuzzers/audio_decoder_fuzzer.h"
namespace webrtc {
void FuzzOneInput(const uint8_t* data, size_t size) {
diff --git a/test/fuzzers/audio_decoder_opus_fuzzer.cc b/test/fuzzers/audio_decoder_opus_fuzzer.cc
index 23b65a6..a015f98 100644
--- a/test/fuzzers/audio_decoder_opus_fuzzer.cc
+++ b/test/fuzzers/audio_decoder_opus_fuzzer.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.h"
-#include "webrtc/test/fuzzers/audio_decoder_fuzzer.h"
+#include "modules/audio_coding/codecs/opus/audio_decoder_opus.h"
+#include "test/fuzzers/audio_decoder_fuzzer.h"
namespace webrtc {
void FuzzOneInput(const uint8_t* data, size_t size) {
diff --git a/test/fuzzers/audio_decoder_opus_redundant_fuzzer.cc b/test/fuzzers/audio_decoder_opus_redundant_fuzzer.cc
index e623301..efcba0f 100644
--- a/test/fuzzers/audio_decoder_opus_redundant_fuzzer.cc
+++ b/test/fuzzers/audio_decoder_opus_redundant_fuzzer.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.h"
-#include "webrtc/test/fuzzers/audio_decoder_fuzzer.h"
+#include "modules/audio_coding/codecs/opus/audio_decoder_opus.h"
+#include "test/fuzzers/audio_decoder_fuzzer.h"
namespace webrtc {
void FuzzOneInput(const uint8_t* data, size_t size) {
diff --git a/test/fuzzers/audio_processing_fuzzer.cc b/test/fuzzers/audio_processing_fuzzer.cc
index e31c057..9faea41 100644
--- a/test/fuzzers/audio_processing_fuzzer.cc
+++ b/test/fuzzers/audio_processing_fuzzer.cc
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/fuzzers/audio_processing_fuzzer.h"
+#include "test/fuzzers/audio_processing_fuzzer.h"
#include <algorithm>
#include <array>
#include <cmath>
-#include "webrtc/modules/audio_processing/include/audio_processing.h"
-#include "webrtc/modules/include/module_common_types.h"
-#include "webrtc/rtc_base/checks.h"
+#include "modules/audio_processing/include/audio_processing.h"
+#include "modules/include/module_common_types.h"
+#include "rtc_base/checks.h"
namespace webrtc {
namespace {
diff --git a/test/fuzzers/audio_processing_fuzzer.h b/test/fuzzers/audio_processing_fuzzer.h
index 4a54d69..337d9b2 100644
--- a/test/fuzzers/audio_processing_fuzzer.h
+++ b/test/fuzzers/audio_processing_fuzzer.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_FUZZERS_AUDIO_PROCESSING_FUZZER_H_
-#define WEBRTC_TEST_FUZZERS_AUDIO_PROCESSING_FUZZER_H_
+#ifndef TEST_FUZZERS_AUDIO_PROCESSING_FUZZER_H_
+#define TEST_FUZZERS_AUDIO_PROCESSING_FUZZER_H_
#include <memory>
-#include "webrtc/modules/audio_processing/include/audio_processing.h"
+#include "modules/audio_processing/include/audio_processing.h"
namespace webrtc {
rtc::Optional<bool> ParseBool(const uint8_t** data, size_t* remaining_size);
@@ -24,4 +24,4 @@
std::unique_ptr<AudioProcessing> apm);
} // namespace webrtc
-#endif // WEBRTC_TEST_FUZZERS_AUDIO_PROCESSING_FUZZER_H_
+#endif // TEST_FUZZERS_AUDIO_PROCESSING_FUZZER_H_
diff --git a/test/fuzzers/audio_processing_fuzzer_configs.cc b/test/fuzzers/audio_processing_fuzzer_configs.cc
index 21810ad..5c60605 100644
--- a/test/fuzzers/audio_processing_fuzzer_configs.cc
+++ b/test/fuzzers/audio_processing_fuzzer_configs.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/modules/audio_processing/include/audio_processing.h"
-#include "webrtc/test/fuzzers/audio_processing_fuzzer.h"
+#include "modules/audio_processing/include/audio_processing.h"
+#include "test/fuzzers/audio_processing_fuzzer.h"
-#include "webrtc/api/optional.h"
+#include "api/optional.h"
namespace webrtc {
diff --git a/test/fuzzers/congestion_controller_feedback_fuzzer.cc b/test/fuzzers/congestion_controller_feedback_fuzzer.cc
index e9dec3d..a7b89fc 100644
--- a/test/fuzzers/congestion_controller_feedback_fuzzer.cc
+++ b/test/fuzzers/congestion_controller_feedback_fuzzer.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/modules/congestion_controller/include/receive_side_congestion_controller.h"
-#include "webrtc/modules/pacing/packet_router.h"
-#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
-#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
+#include "modules/congestion_controller/include/receive_side_congestion_controller.h"
+#include "modules/pacing/packet_router.h"
+#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
+#include "modules/rtp_rtcp/source/byte_io.h"
namespace webrtc {
diff --git a/test/fuzzers/flexfec_header_reader_fuzzer.cc b/test/fuzzers/flexfec_header_reader_fuzzer.cc
index f253ca9..a5694ea 100644
--- a/test/fuzzers/flexfec_header_reader_fuzzer.cc
+++ b/test/fuzzers/flexfec_header_reader_fuzzer.cc
@@ -10,10 +10,10 @@
#include <algorithm>
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "webrtc/modules/rtp_rtcp/source/flexfec_header_reader_writer.h"
-#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "modules/rtp_rtcp/source/flexfec_header_reader_writer.h"
+#include "modules/rtp_rtcp/source/forward_error_correction.h"
+#include "rtc_base/scoped_ref_ptr.h"
namespace webrtc {
diff --git a/test/fuzzers/flexfec_receiver_fuzzer.cc b/test/fuzzers/flexfec_receiver_fuzzer.cc
index b0da803..14208bd 100644
--- a/test/fuzzers/flexfec_receiver_fuzzer.cc
+++ b/test/fuzzers/flexfec_receiver_fuzzer.cc
@@ -10,11 +10,11 @@
#include <algorithm>
-#include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
-#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
-#include "webrtc/rtc_base/basictypes.h"
+#include "modules/rtp_rtcp/include/flexfec_receiver.h"
+#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "modules/rtp_rtcp/source/byte_io.h"
+#include "modules/rtp_rtcp/source/rtp_packet_received.h"
+#include "rtc_base/basictypes.h"
namespace webrtc {
diff --git a/test/fuzzers/flexfec_sender_fuzzer.cc b/test/fuzzers/flexfec_sender_fuzzer.cc
index 44ac079..64bc3ed 100644
--- a/test/fuzzers/flexfec_sender_fuzzer.cc
+++ b/test/fuzzers/flexfec_sender_fuzzer.cc
@@ -10,11 +10,11 @@
#include <memory>
-#include "webrtc/modules/rtp_rtcp/include/flexfec_sender.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h"
-#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
-#include "webrtc/system_wrappers/include/clock.h"
+#include "modules/rtp_rtcp/include/flexfec_sender.h"
+#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
+#include "modules/rtp_rtcp/source/byte_io.h"
+#include "system_wrappers/include/clock.h"
namespace webrtc {
diff --git a/test/fuzzers/h264_bitstream_parser_fuzzer.cc b/test/fuzzers/h264_bitstream_parser_fuzzer.cc
index 5661188..a9384d7 100644
--- a/test/fuzzers/h264_bitstream_parser_fuzzer.cc
+++ b/test/fuzzers/h264_bitstream_parser_fuzzer.cc
@@ -9,7 +9,7 @@
*/
#include <stdint.h>
-#include "webrtc/common_video/h264/h264_bitstream_parser.h"
+#include "common_video/h264/h264_bitstream_parser.h"
namespace webrtc {
void FuzzOneInput(const uint8_t* data, size_t size) {
diff --git a/test/fuzzers/h264_depacketizer_fuzzer.cc b/test/fuzzers/h264_depacketizer_fuzzer.cc
index ca73d94..2cefb1e 100644
--- a/test/fuzzers/h264_depacketizer_fuzzer.cc
+++ b/test/fuzzers/h264_depacketizer_fuzzer.cc
@@ -7,7 +7,7 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/modules/rtp_rtcp/source/rtp_format_h264.h"
+#include "modules/rtp_rtcp/source/rtp_format_h264.h"
namespace webrtc {
void FuzzOneInput(const uint8_t* data, size_t size) {
diff --git a/test/fuzzers/neteq_rtp_fuzzer.cc b/test/fuzzers/neteq_rtp_fuzzer.cc
index 5eba72c..bf3ce93 100644
--- a/test/fuzzers/neteq_rtp_fuzzer.cc
+++ b/test/fuzzers/neteq_rtp_fuzzer.cc
@@ -12,12 +12,12 @@
#include <memory>
#include <vector>
-#include "webrtc/api/array_view.h"
-#include "webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h"
-#include "webrtc/modules/audio_coding/neteq/tools/audio_checksum.h"
-#include "webrtc/modules/audio_coding/neteq/tools/encode_neteq_input.h"
-#include "webrtc/modules/audio_coding/neteq/tools/neteq_test.h"
-#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
+#include "api/array_view.h"
+#include "modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h"
+#include "modules/audio_coding/neteq/tools/audio_checksum.h"
+#include "modules/audio_coding/neteq/tools/encode_neteq_input.h"
+#include "modules/audio_coding/neteq/tools/neteq_test.h"
+#include "modules/rtp_rtcp/source/byte_io.h"
namespace webrtc {
namespace test {
diff --git a/test/fuzzers/packet_buffer_fuzzer.cc b/test/fuzzers/packet_buffer_fuzzer.cc
index 099fe21..df6baf4 100644
--- a/test/fuzzers/packet_buffer_fuzzer.cc
+++ b/test/fuzzers/packet_buffer_fuzzer.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/modules/video_coding/packet_buffer.h"
-#include "webrtc/system_wrappers/include/clock.h"
+#include "modules/video_coding/packet_buffer.h"
+#include "system_wrappers/include/clock.h"
namespace webrtc {
diff --git a/test/fuzzers/pseudotcp_parser_fuzzer.cc b/test/fuzzers/pseudotcp_parser_fuzzer.cc
index ac5331b..90123c3 100644
--- a/test/fuzzers/pseudotcp_parser_fuzzer.cc
+++ b/test/fuzzers/pseudotcp_parser_fuzzer.cc
@@ -11,8 +11,8 @@
#include <stddef.h>
#include <stdint.h>
-#include "webrtc/p2p/base/pseudotcp.h"
-#include "webrtc/rtc_base/thread.h"
+#include "p2p/base/pseudotcp.h"
+#include "rtc_base/thread.h"
namespace webrtc {
class FakeIPseudoTcpNotify : public cricket::IPseudoTcpNotify {
diff --git a/test/fuzzers/residual_echo_detector_fuzzer.cc b/test/fuzzers/residual_echo_detector_fuzzer.cc
index 8250c15..c3c8123 100644
--- a/test/fuzzers/residual_echo_detector_fuzzer.cc
+++ b/test/fuzzers/residual_echo_detector_fuzzer.cc
@@ -15,8 +15,8 @@
#include <bitset>
#include <vector>
-#include "webrtc/modules/audio_processing/residual_echo_detector.h"
-#include "webrtc/rtc_base/checks.h"
+#include "modules/audio_processing/residual_echo_detector.h"
+#include "rtc_base/checks.h"
namespace webrtc {
diff --git a/test/fuzzers/rtcp_receiver_fuzzer.cc b/test/fuzzers/rtcp_receiver_fuzzer.cc
index 9d93f83..8782f0c 100644
--- a/test/fuzzers/rtcp_receiver_fuzzer.cc
+++ b/test/fuzzers/rtcp_receiver_fuzzer.cc
@@ -7,9 +7,9 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/modules/rtp_rtcp/source/rtcp_receiver.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/system_wrappers/include/clock.h"
+#include "modules/rtp_rtcp/source/rtcp_receiver.h"
+#include "rtc_base/checks.h"
+#include "system_wrappers/include/clock.h"
namespace webrtc {
namespace {
diff --git a/test/fuzzers/rtp_header_fuzzer.cc b/test/fuzzers/rtp_header_fuzzer.cc
index 9e111a8..09bf811 100644
--- a/test/fuzzers/rtp_header_fuzzer.cc
+++ b/test/fuzzers/rtp_header_fuzzer.cc
@@ -10,9 +10,9 @@
#include <bitset>
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
-#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
+#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "modules/rtp_rtcp/source/rtp_packet_received.h"
+#include "modules/rtp_rtcp/source/rtp_utility.h"
namespace webrtc {
// We decide which header extensions to register by reading two bytes
diff --git a/test/fuzzers/rtp_packet_fuzzer.cc b/test/fuzzers/rtp_packet_fuzzer.cc
index 3e33699..c89cb46 100644
--- a/test/fuzzers/rtp_packet_fuzzer.cc
+++ b/test/fuzzers/rtp_packet_fuzzer.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h"
-#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
-#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
+#include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
+#include "modules/rtp_rtcp/source/rtp_header_extensions.h"
+#include "modules/rtp_rtcp/source/rtp_packet_received.h"
namespace webrtc {
diff --git a/test/fuzzers/sdp_parser_fuzzer.cc b/test/fuzzers/sdp_parser_fuzzer.cc
index f21c991..e47156c 100644
--- a/test/fuzzers/sdp_parser_fuzzer.cc
+++ b/test/fuzzers/sdp_parser_fuzzer.cc
@@ -11,7 +11,7 @@
#include <stddef.h>
#include <stdint.h>
-#include "webrtc/api/jsepsessiondescription.h"
+#include "api/jsepsessiondescription.h"
namespace webrtc {
void FuzzOneInput(const uint8_t* data, size_t size) {
diff --git a/test/fuzzers/stun_parser_fuzzer.cc b/test/fuzzers/stun_parser_fuzzer.cc
index 02f10b1..02e42bc 100644
--- a/test/fuzzers/stun_parser_fuzzer.cc
+++ b/test/fuzzers/stun_parser_fuzzer.cc
@@ -11,7 +11,7 @@
#include <stddef.h>
#include <stdint.h>
-#include "webrtc/p2p/base/stun.h"
+#include "p2p/base/stun.h"
namespace webrtc {
void FuzzOneInput(const uint8_t* data, size_t size) {
diff --git a/test/fuzzers/stun_validator_fuzzer.cc b/test/fuzzers/stun_validator_fuzzer.cc
index 1f919f5..9873ff4 100644
--- a/test/fuzzers/stun_validator_fuzzer.cc
+++ b/test/fuzzers/stun_validator_fuzzer.cc
@@ -11,7 +11,7 @@
#include <stddef.h>
#include <stdint.h>
-#include "webrtc/p2p/base/stun.h"
+#include "p2p/base/stun.h"
namespace webrtc {
void FuzzOneInput(const uint8_t* data, size_t size) {
diff --git a/test/fuzzers/transport_feedback_packet_loss_tracker_fuzzer.cc b/test/fuzzers/transport_feedback_packet_loss_tracker_fuzzer.cc
index bfd03fa..31bc163 100644
--- a/test/fuzzers/transport_feedback_packet_loss_tracker_fuzzer.cc
+++ b/test/fuzzers/transport_feedback_packet_loss_tracker_fuzzer.cc
@@ -10,11 +10,11 @@
#include <algorithm>
-#include "webrtc/api/array_view.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
-#include "webrtc/voice_engine/transport_feedback_packet_loss_tracker.h"
+#include "api/array_view.h"
+#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "modules/rtp_rtcp/source/byte_io.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
+#include "voice_engine/transport_feedback_packet_loss_tracker.h"
namespace webrtc {
diff --git a/test/fuzzers/turn_unwrap_fuzzer.cc b/test/fuzzers/turn_unwrap_fuzzer.cc
index 818fbe9..ed9f34d 100644
--- a/test/fuzzers/turn_unwrap_fuzzer.cc
+++ b/test/fuzzers/turn_unwrap_fuzzer.cc
@@ -11,7 +11,7 @@
#include <stddef.h>
#include <stdint.h>
-#include "webrtc/media/base/turnutils.h"
+#include "media/base/turnutils.h"
namespace webrtc {
void FuzzOneInput(const uint8_t* data, size_t size) {
diff --git a/test/fuzzers/ulpfec_generator_fuzzer.cc b/test/fuzzers/ulpfec_generator_fuzzer.cc
index 01729ef..0642baa 100644
--- a/test/fuzzers/ulpfec_generator_fuzzer.cc
+++ b/test/fuzzers/ulpfec_generator_fuzzer.cc
@@ -10,10 +10,10 @@
#include <memory>
-#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
-#include "webrtc/modules/rtp_rtcp/source/fec_test_helper.h"
-#include "webrtc/modules/rtp_rtcp/source/ulpfec_generator.h"
-#include "webrtc/rtc_base/checks.h"
+#include "modules/rtp_rtcp/source/byte_io.h"
+#include "modules/rtp_rtcp/source/fec_test_helper.h"
+#include "modules/rtp_rtcp/source/ulpfec_generator.h"
+#include "rtc_base/checks.h"
namespace webrtc {
diff --git a/test/fuzzers/ulpfec_header_reader_fuzzer.cc b/test/fuzzers/ulpfec_header_reader_fuzzer.cc
index e69f463..6a6394f 100644
--- a/test/fuzzers/ulpfec_header_reader_fuzzer.cc
+++ b/test/fuzzers/ulpfec_header_reader_fuzzer.cc
@@ -10,10 +10,10 @@
#include <algorithm>
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h"
-#include "webrtc/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "modules/rtp_rtcp/source/forward_error_correction.h"
+#include "modules/rtp_rtcp/source/ulpfec_header_reader_writer.h"
+#include "rtc_base/scoped_ref_ptr.h"
namespace webrtc {
diff --git a/test/fuzzers/vp8_depacketizer_fuzzer.cc b/test/fuzzers/vp8_depacketizer_fuzzer.cc
index d048372..bd9ac8f 100644
--- a/test/fuzzers/vp8_depacketizer_fuzzer.cc
+++ b/test/fuzzers/vp8_depacketizer_fuzzer.cc
@@ -7,7 +7,7 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/modules/rtp_rtcp/source/rtp_format_vp8.h"
+#include "modules/rtp_rtcp/source/rtp_format_vp8.h"
namespace webrtc {
void FuzzOneInput(const uint8_t* data, size_t size) {
diff --git a/test/fuzzers/vp8_qp_parser_fuzzer.cc b/test/fuzzers/vp8_qp_parser_fuzzer.cc
index 5135f1a..2ecfd82 100644
--- a/test/fuzzers/vp8_qp_parser_fuzzer.cc
+++ b/test/fuzzers/vp8_qp_parser_fuzzer.cc
@@ -7,7 +7,7 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/modules/video_coding/utility/vp8_header_parser.h"
+#include "modules/video_coding/utility/vp8_header_parser.h"
namespace webrtc {
void FuzzOneInput(const uint8_t* data, size_t size) {
diff --git a/test/fuzzers/vp9_depacketizer_fuzzer.cc b/test/fuzzers/vp9_depacketizer_fuzzer.cc
index 02a7cc0..8f62b42 100644
--- a/test/fuzzers/vp9_depacketizer_fuzzer.cc
+++ b/test/fuzzers/vp9_depacketizer_fuzzer.cc
@@ -7,7 +7,7 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h"
+#include "modules/rtp_rtcp/source/rtp_format_vp9.h"
namespace webrtc {
void FuzzOneInput(const uint8_t* data, size_t size) {
diff --git a/test/fuzzers/vp9_qp_parser_fuzzer.cc b/test/fuzzers/vp9_qp_parser_fuzzer.cc
index 7dbed2e..3cff95f 100644
--- a/test/fuzzers/vp9_qp_parser_fuzzer.cc
+++ b/test/fuzzers/vp9_qp_parser_fuzzer.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.h"
+#include "modules/video_coding/utility/vp9_uncompressed_header_parser.h"
namespace webrtc {
void FuzzOneInput(const uint8_t* data, size_t size) {
diff --git a/test/fuzzers/webrtc_fuzzer_main.cc b/test/fuzzers/webrtc_fuzzer_main.cc
index a5d5ed1..ca4bc15 100644
--- a/test/fuzzers/webrtc_fuzzer_main.cc
+++ b/test/fuzzers/webrtc_fuzzer_main.cc
@@ -12,7 +12,7 @@
// It's intended to set sane defaults, such as removing logging for further
// fuzzing efficiency.
-#include "webrtc/rtc_base/logging.h"
+#include "rtc_base/logging.h"
namespace {
bool g_initialized = false;
diff --git a/test/gl/gl_renderer.cc b/test/gl/gl_renderer.cc
index c55f347..ef7ab9c 100644
--- a/test/gl/gl_renderer.cc
+++ b/test/gl/gl_renderer.cc
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gl/gl_renderer.h"
+#include "test/gl/gl_renderer.h"
#include <string.h>
-#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
-#include "webrtc/rtc_base/checks.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
+#include "rtc_base/checks.h"
namespace webrtc {
namespace test {
diff --git a/test/gl/gl_renderer.h b/test/gl/gl_renderer.h
index 01dc18d..390e5de 100644
--- a/test/gl/gl_renderer.h
+++ b/test/gl/gl_renderer.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_GL_GL_RENDERER_H_
-#define WEBRTC_TEST_GL_GL_RENDERER_H_
+#ifndef TEST_GL_GL_RENDERER_H_
+#define TEST_GL_GL_RENDERER_H_
#ifdef WEBRTC_MAC
#include <OpenGL/gl.h>
@@ -17,8 +17,8 @@
#include <GL/gl.h>
#endif
-#include "webrtc/test/video_renderer.h"
-#include "webrtc/typedefs.h"
+#include "test/video_renderer.h"
+#include "typedefs.h"
namespace webrtc {
@@ -47,4 +47,4 @@
} // test
} // webrtc
-#endif // WEBRTC_TEST_GL_GL_RENDERER_H_
+#endif // TEST_GL_GL_RENDERER_H_
diff --git a/test/gmock.h b/test/gmock.h
index 8e321a0..f137d08 100644
--- a/test/gmock.h
+++ b/test/gmock.h
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_GMOCK_H_
-#define WEBRTC_TEST_GMOCK_H_
+#ifndef TEST_GMOCK_H_
+#define TEST_GMOCK_H_
-#include "webrtc/rtc_base/ignore_wundef.h"
+#include "rtc_base/ignore_wundef.h"
RTC_PUSH_IGNORING_WUNDEF()
#include "testing/gmock/include/gmock/gmock.h"
RTC_POP_IGNORING_WUNDEF()
-#endif // WEBRTC_TEST_GMOCK_H_
+#endif // TEST_GMOCK_H_
diff --git a/test/gtest.h b/test/gtest.h
index 886e7b8..928ec49 100644
--- a/test/gtest.h
+++ b/test/gtest.h
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_GTEST_H_
-#define WEBRTC_TEST_GTEST_H_
+#ifndef TEST_GTEST_H_
+#define TEST_GTEST_H_
-#include "webrtc/rtc_base/ignore_wundef.h"
+#include "rtc_base/ignore_wundef.h"
RTC_PUSH_IGNORING_WUNDEF()
#include "testing/gtest/include/gtest/gtest.h"
@@ -24,4 +24,4 @@
#define GTEST_HAS_DEATH_TEST 0
#endif
-#endif // WEBRTC_TEST_GTEST_H_
+#endif // TEST_GTEST_H_
diff --git a/test/ios/test_support.h b/test/ios/test_support.h
index a962003..7bc2993 100644
--- a/test/ios/test_support.h
+++ b/test/ios/test_support.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_IOS_TEST_SUPPORT_H_
-#define WEBRTC_TEST_IOS_TEST_SUPPORT_H_
+#ifndef TEST_IOS_TEST_SUPPORT_H_
+#define TEST_IOS_TEST_SUPPORT_H_
namespace rtc {
namespace test {
@@ -22,4 +22,4 @@
} // namespace test
} // namespace rtc
-#endif // WEBRTC_TEST_IOS_TEST_SUPPORT_H_
+#endif // TEST_IOS_TEST_SUPPORT_H_
diff --git a/test/ios/test_support.mm b/test/ios/test_support.mm
index a01b03c..603bc8c 100644
--- a/test/ios/test_support.mm
+++ b/test/ios/test_support.mm
@@ -10,9 +10,9 @@
#import <UIKit/UIKit.h>
-#include "webrtc/test/ios/test_support.h"
+#include "test/ios/test_support.h"
-#import "webrtc/sdk/objc/Framework/Classes/Common/RTCUIApplicationStatusObserver.h"
+#import "sdk/objc/Framework/Classes/Common/RTCUIApplicationStatusObserver.h"
// Springboard will kill any iOS app that fails to check in after launch within
// a given time. Starting a UIApplication before invoking TestSuite::Run
diff --git a/test/layer_filtering_transport.cc b/test/layer_filtering_transport.cc
index 7d7288a..3a2a97e 100644
--- a/test/layer_filtering_transport.cc
+++ b/test/layer_filtering_transport.cc
@@ -10,12 +10,12 @@
#include <memory>
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
-#include "webrtc/modules/rtp_rtcp/source/rtp_format.h"
-#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/test/layer_filtering_transport.h"
+#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "modules/rtp_rtcp/source/byte_io.h"
+#include "modules/rtp_rtcp/source/rtp_format.h"
+#include "modules/rtp_rtcp/source/rtp_utility.h"
+#include "rtc_base/checks.h"
+#include "test/layer_filtering_transport.h"
namespace webrtc {
namespace test {
diff --git a/test/layer_filtering_transport.h b/test/layer_filtering_transport.h
index 32eb4c5..abbc86a 100644
--- a/test/layer_filtering_transport.h
+++ b/test/layer_filtering_transport.h
@@ -7,13 +7,13 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_LAYER_FILTERING_TRANSPORT_H_
-#define WEBRTC_TEST_LAYER_FILTERING_TRANSPORT_H_
+#ifndef TEST_LAYER_FILTERING_TRANSPORT_H_
+#define TEST_LAYER_FILTERING_TRANSPORT_H_
-#include "webrtc/call/call.h"
-#include "webrtc/test/direct_transport.h"
-#include "webrtc/test/fake_network_pipe.h"
-#include "webrtc/test/single_threaded_task_queue.h"
+#include "call/call.h"
+#include "test/direct_transport.h"
+#include "test/fake_network_pipe.h"
+#include "test/single_threaded_task_queue.h"
#include <map>
@@ -50,4 +50,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_LAYER_FILTERING_TRANSPORT_H_
+#endif // TEST_LAYER_FILTERING_TRANSPORT_H_
diff --git a/test/linux/glx_renderer.cc b/test/linux/glx_renderer.cc
index d6979c8..4dbf1c9 100644
--- a/test/linux/glx_renderer.cc
+++ b/test/linux/glx_renderer.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/linux/glx_renderer.h"
+#include "test/linux/glx_renderer.h"
#include <assert.h>
#include <stdlib.h>
@@ -16,7 +16,7 @@
#include <X11/Xatom.h>
#include <X11/Xlib.h>
-#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
namespace webrtc {
namespace test {
diff --git a/test/linux/glx_renderer.h b/test/linux/glx_renderer.h
index 4a758db..646cfc8 100644
--- a/test/linux/glx_renderer.h
+++ b/test/linux/glx_renderer.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_LINUX_GLX_RENDERER_H_
-#define WEBRTC_TEST_LINUX_GLX_RENDERER_H_
+#ifndef TEST_LINUX_GLX_RENDERER_H_
+#define TEST_LINUX_GLX_RENDERER_H_
#include <GL/glx.h>
#include <X11/Xlib.h>
-#include "webrtc/test/gl/gl_renderer.h"
-#include "webrtc/typedefs.h"
+#include "test/gl/gl_renderer.h"
+#include "typedefs.h"
namespace webrtc {
namespace test {
@@ -44,4 +44,4 @@
} // test
} // webrtc
-#endif // WEBRTC_TEST_LINUX_GLX_RENDERER_H_
+#endif // TEST_LINUX_GLX_RENDERER_H_
diff --git a/test/linux/video_renderer_linux.cc b/test/linux/video_renderer_linux.cc
index 6f69dd7..9428489 100644
--- a/test/linux/video_renderer_linux.cc
+++ b/test/linux/video_renderer_linux.cc
@@ -7,9 +7,9 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/video_renderer.h"
+#include "test/video_renderer.h"
-#include "webrtc/test/linux/glx_renderer.h"
+#include "test/linux/glx_renderer.h"
namespace webrtc {
namespace test {
diff --git a/test/mac/run_test.mm b/test/mac/run_test.mm
index 7576b55..38c6c8f 100644
--- a/test/mac/run_test.mm
+++ b/test/mac/run_test.mm
@@ -10,7 +10,7 @@
#import <Cocoa/Cocoa.h>
-#include "webrtc/test/run_test.h"
+#include "test/run_test.h"
// Converting a C++ function pointer to an Objective-C block.
typedef void(^TestBlock)();
diff --git a/test/mac/video_renderer_mac.h b/test/mac/video_renderer_mac.h
index 2d55163..19349c0 100644
--- a/test/mac/video_renderer_mac.h
+++ b/test/mac/video_renderer_mac.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_MAC_VIDEO_RENDERER_MAC_H_
-#define WEBRTC_TEST_MAC_VIDEO_RENDERER_MAC_H_
+#ifndef TEST_MAC_VIDEO_RENDERER_MAC_H_
+#define TEST_MAC_VIDEO_RENDERER_MAC_H_
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/test/gl/gl_renderer.h"
+#include "rtc_base/constructormagic.h"
+#include "test/gl/gl_renderer.h"
@class CocoaWindow;
@@ -37,4 +37,4 @@
} // test
} // webrtc
-#endif // WEBRTC_TEST_MAC_VIDEO_RENDERER_MAC_H_
+#endif // TEST_MAC_VIDEO_RENDERER_MAC_H_
diff --git a/test/mac/video_renderer_mac.mm b/test/mac/video_renderer_mac.mm
index 411a7d0..56bf360 100644
--- a/test/mac/video_renderer_mac.mm
+++ b/test/mac/video_renderer_mac.mm
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/mac/video_renderer_mac.h"
+#include "test/mac/video_renderer_mac.h"
#import <Cocoa/Cocoa.h>
diff --git a/test/mock_audio_decoder.cc b/test/mock_audio_decoder.cc
index 102ba79..5af9f37 100644
--- a/test/mock_audio_decoder.cc
+++ b/test/mock_audio_decoder.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/mock_audio_decoder.h"
+#include "test/mock_audio_decoder.h"
namespace webrtc {
diff --git a/test/mock_audio_decoder.h b/test/mock_audio_decoder.h
index d124b0f..67cd0f7 100644
--- a/test/mock_audio_decoder.h
+++ b/test/mock_audio_decoder.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_MOCK_AUDIO_DECODER_H_
-#define WEBRTC_TEST_MOCK_AUDIO_DECODER_H_
+#ifndef TEST_MOCK_AUDIO_DECODER_H_
+#define TEST_MOCK_AUDIO_DECODER_H_
-#include "webrtc/api/audio_codecs/audio_decoder.h"
-#include "webrtc/test/gmock.h"
+#include "api/audio_codecs/audio_decoder.h"
+#include "test/gmock.h"
namespace webrtc {
@@ -35,4 +35,4 @@
};
} // namespace webrtc
-#endif // WEBRTC_TEST_MOCK_AUDIO_DECODER_H_
+#endif // TEST_MOCK_AUDIO_DECODER_H_
diff --git a/test/mock_audio_decoder_factory.h b/test/mock_audio_decoder_factory.h
index ae7cc42..6104b06 100644
--- a/test/mock_audio_decoder_factory.h
+++ b/test/mock_audio_decoder_factory.h
@@ -8,16 +8,16 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_MOCK_AUDIO_DECODER_FACTORY_H_
-#define WEBRTC_TEST_MOCK_AUDIO_DECODER_FACTORY_H_
+#ifndef TEST_MOCK_AUDIO_DECODER_FACTORY_H_
+#define TEST_MOCK_AUDIO_DECODER_FACTORY_H_
#include <memory>
#include <vector>
-#include "webrtc/api/audio_codecs/audio_decoder_factory.h"
-#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/test/gmock.h"
+#include "api/audio_codecs/audio_decoder_factory.h"
+#include "api/audio_codecs/builtin_audio_decoder_factory.h"
+#include "rtc_base/scoped_ref_ptr.h"
+#include "test/gmock.h"
namespace webrtc {
@@ -80,4 +80,4 @@
} // namespace webrtc
-#endif // WEBRTC_TEST_MOCK_AUDIO_DECODER_FACTORY_H_
+#endif // TEST_MOCK_AUDIO_DECODER_FACTORY_H_
diff --git a/test/mock_audio_encoder.cc b/test/mock_audio_encoder.cc
index 5365ef0..cd89bdd 100644
--- a/test/mock_audio_encoder.cc
+++ b/test/mock_audio_encoder.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/mock_audio_encoder.h"
+#include "test/mock_audio_encoder.h"
namespace webrtc {
diff --git a/test/mock_audio_encoder.h b/test/mock_audio_encoder.h
index c30b35e..8196cf1 100644
--- a/test/mock_audio_encoder.h
+++ b/test/mock_audio_encoder.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_MOCK_AUDIO_ENCODER_H_
-#define WEBRTC_TEST_MOCK_AUDIO_ENCODER_H_
+#ifndef TEST_MOCK_AUDIO_ENCODER_H_
+#define TEST_MOCK_AUDIO_ENCODER_H_
#include <string>
-#include "webrtc/api/array_view.h"
-#include "webrtc/api/audio_codecs/audio_encoder.h"
-#include "webrtc/test/gmock.h"
+#include "api/array_view.h"
+#include "api/audio_codecs/audio_encoder.h"
+#include "test/gmock.h"
namespace webrtc {
@@ -104,4 +104,4 @@
} // namespace webrtc
-#endif // WEBRTC_TEST_MOCK_AUDIO_ENCODER_H_
+#endif // TEST_MOCK_AUDIO_ENCODER_H_
diff --git a/test/mock_audio_encoder_factory.h b/test/mock_audio_encoder_factory.h
index c095197..9b63f7d 100644
--- a/test/mock_audio_encoder_factory.h
+++ b/test/mock_audio_encoder_factory.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_MOCK_AUDIO_ENCODER_FACTORY_H_
-#define WEBRTC_TEST_MOCK_AUDIO_ENCODER_FACTORY_H_
+#ifndef TEST_MOCK_AUDIO_ENCODER_FACTORY_H_
+#define TEST_MOCK_AUDIO_ENCODER_FACTORY_H_
#include <memory>
#include <vector>
-#include "webrtc/api/audio_codecs/audio_encoder_factory.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/test/gmock.h"
+#include "api/audio_codecs/audio_encoder_factory.h"
+#include "rtc_base/scoped_ref_ptr.h"
+#include "test/gmock.h"
namespace webrtc {
@@ -88,4 +88,4 @@
} // namespace webrtc
-#endif // WEBRTC_TEST_MOCK_AUDIO_ENCODER_FACTORY_H_
+#endif // TEST_MOCK_AUDIO_ENCODER_FACTORY_H_
diff --git a/test/mock_transport.h b/test/mock_transport.h
index d76dc6e..9837593 100644
--- a/test/mock_transport.h
+++ b/test/mock_transport.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_MOCK_TRANSPORT_H_
-#define WEBRTC_TEST_MOCK_TRANSPORT_H_
+#ifndef TEST_MOCK_TRANSPORT_H_
+#define TEST_MOCK_TRANSPORT_H_
-#include "webrtc/api/call/transport.h"
-#include "webrtc/test/gmock.h"
+#include "api/call/transport.h"
+#include "test/gmock.h"
namespace webrtc {
@@ -25,4 +25,4 @@
MOCK_METHOD2(SendRtcp, bool(const uint8_t* data, size_t len));
};
} // namespace webrtc
-#endif // WEBRTC_TEST_MOCK_TRANSPORT_H_
+#endif // TEST_MOCK_TRANSPORT_H_
diff --git a/test/mock_voe_channel_proxy.h b/test/mock_voe_channel_proxy.h
index b151aa8..77fb171 100644
--- a/test/mock_voe_channel_proxy.h
+++ b/test/mock_voe_channel_proxy.h
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_MOCK_VOE_CHANNEL_PROXY_H_
-#define WEBRTC_TEST_MOCK_VOE_CHANNEL_PROXY_H_
+#ifndef TEST_MOCK_VOE_CHANNEL_PROXY_H_
+#define TEST_MOCK_VOE_CHANNEL_PROXY_H_
#include <string>
-#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
-#include "webrtc/test/gmock.h"
-#include "webrtc/voice_engine/channel_proxy.h"
+#include "modules/rtp_rtcp/source/rtp_packet_received.h"
+#include "test/gmock.h"
+#include "voice_engine/channel_proxy.h"
namespace webrtc {
namespace test {
@@ -97,4 +97,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_MOCK_VOE_CHANNEL_PROXY_H_
+#endif // TEST_MOCK_VOE_CHANNEL_PROXY_H_
diff --git a/test/mock_voice_engine.h b/test/mock_voice_engine.h
index 79443b9..d644f24 100644
--- a/test/mock_voice_engine.h
+++ b/test/mock_voice_engine.h
@@ -8,17 +8,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_AUDIO_MOCK_VOICE_ENGINE_H_
-#define WEBRTC_AUDIO_MOCK_VOICE_ENGINE_H_
+#ifndef AUDIO_MOCK_VOICE_ENGINE_H_
+#define AUDIO_MOCK_VOICE_ENGINE_H_
#include <memory>
-#include "webrtc/modules/audio_device/include/mock_audio_device.h"
-#include "webrtc/modules/audio_device/include/mock_audio_transport.h"
-#include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h"
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/mock_voe_channel_proxy.h"
-#include "webrtc/voice_engine/voice_engine_impl.h"
+#include "modules/audio_device/include/mock_audio_device.h"
+#include "modules/audio_device/include/mock_audio_transport.h"
+#include "modules/rtp_rtcp/mocks/mock_rtp_rtcp.h"
+#include "test/gmock.h"
+#include "test/mock_voe_channel_proxy.h"
+#include "voice_engine/voice_engine_impl.h"
namespace webrtc {
namespace voe {
@@ -258,4 +258,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_AUDIO_MOCK_VOICE_ENGINE_H_
+#endif // AUDIO_MOCK_VOICE_ENGINE_H_
diff --git a/test/null_platform_renderer.cc b/test/null_platform_renderer.cc
index 362f7db..48e4cc0 100644
--- a/test/null_platform_renderer.cc
+++ b/test/null_platform_renderer.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/video_renderer.h"
+#include "test/video_renderer.h"
namespace webrtc {
namespace test {
diff --git a/test/null_transport.cc b/test/null_transport.cc
index 7fa36d1..efbd949 100644
--- a/test/null_transport.cc
+++ b/test/null_transport.cc
@@ -7,7 +7,7 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/null_transport.h"
+#include "test/null_transport.h"
namespace webrtc {
namespace test {
diff --git a/test/null_transport.h b/test/null_transport.h
index 41c4759..f264e7b 100644
--- a/test/null_transport.h
+++ b/test/null_transport.h
@@ -7,10 +7,10 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_NULL_TRANSPORT_H_
-#define WEBRTC_TEST_NULL_TRANSPORT_H_
+#ifndef TEST_NULL_TRANSPORT_H_
+#define TEST_NULL_TRANSPORT_H_
-#include "webrtc/api/call/transport.h"
+#include "api/call/transport.h"
namespace webrtc {
@@ -27,4 +27,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_NULL_TRANSPORT_H_
+#endif // TEST_NULL_TRANSPORT_H_
diff --git a/test/rtcp_packet_parser.cc b/test/rtcp_packet_parser.cc
index ad90ce6..f156608 100644
--- a/test/rtcp_packet_parser.cc
+++ b/test/rtcp_packet_parser.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/rtcp_packet_parser.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
+#include "test/rtcp_packet_parser.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
namespace webrtc {
namespace test {
diff --git a/test/rtcp_packet_parser.h b/test/rtcp_packet_parser.h
index 997c343..96e97c1 100644
--- a/test/rtcp_packet_parser.h
+++ b/test/rtcp_packet_parser.h
@@ -9,27 +9,27 @@
*
*/
-#ifndef WEBRTC_TEST_RTCP_PACKET_PARSER_H_
-#define WEBRTC_TEST_RTCP_PACKET_PARSER_H_
+#ifndef TEST_RTCP_PACKET_PARSER_H_
+#define TEST_RTCP_PACKET_PARSER_H_
-#include "webrtc/api/array_view.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/app.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/common_header.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/fir.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/nack.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/pli.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/receiver_report.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/remb.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbn.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
-#include "webrtc/rtc_base/checks.h"
+#include "api/array_view.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/app.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/bye.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/extended_reports.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/fir.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/nack.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/pli.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/receiver_report.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/remb.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/sdes.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/tmmbn.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/tmmbr.h"
+#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
+#include "rtc_base/checks.h"
namespace webrtc {
namespace test {
@@ -118,4 +118,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_RTCP_PACKET_PARSER_H_
+#endif // TEST_RTCP_PACKET_PARSER_H_
diff --git a/test/rtp_file_reader.cc b/test/rtp_file_reader.cc
index 36ad33a..b1fab07 100644
--- a/test/rtp_file_reader.cc
+++ b/test/rtp_file_reader.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/rtp_file_reader.h"
+#include "test/rtp_file_reader.h"
#include <stdio.h>
@@ -16,11 +16,11 @@
#include <string>
#include <vector>
-#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/format_macros.h"
-#include "webrtc/rtc_base/logging.h"
+#include "modules/rtp_rtcp/source/rtp_utility.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/constructormagic.h"
+#include "rtc_base/format_macros.h"
+#include "rtc_base/logging.h"
namespace webrtc {
namespace test {
diff --git a/test/rtp_file_reader.h b/test/rtp_file_reader.h
index c132d31..75b3b86 100644
--- a/test/rtp_file_reader.h
+++ b/test/rtp_file_reader.h
@@ -7,13 +7,13 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_RTP_FILE_READER_H_
-#define WEBRTC_TEST_RTP_FILE_READER_H_
+#ifndef TEST_RTP_FILE_READER_H_
+#define TEST_RTP_FILE_READER_H_
#include <set>
#include <string>
-#include "webrtc/common_types.h"
+#include "common_types.h"
namespace webrtc {
namespace test {
@@ -46,4 +46,4 @@
};
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_RTP_FILE_READER_H_
+#endif // TEST_RTP_FILE_READER_H_
diff --git a/test/rtp_file_reader_unittest.cc b/test/rtp_file_reader_unittest.cc
index a9cd098..b41f32f 100644
--- a/test/rtp_file_reader_unittest.cc
+++ b/test/rtp_file_reader_unittest.cc
@@ -11,10 +11,10 @@
#include <map>
#include <memory>
-#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/test/rtp_file_reader.h"
-#include "webrtc/test/testsupport/fileutils.h"
+#include "modules/rtp_rtcp/source/rtp_utility.h"
+#include "test/gtest.h"
+#include "test/rtp_file_reader.h"
+#include "test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/test/rtp_file_writer.cc b/test/rtp_file_writer.cc
index 596c234..132ce9a 100644
--- a/test/rtp_file_writer.cc
+++ b/test/rtp_file_writer.cc
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/rtp_file_writer.h"
+#include "test/rtp_file_writer.h"
#include <stdio.h>
#include <string>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/constructormagic.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/constructormagic.h"
namespace webrtc {
namespace test {
diff --git a/test/rtp_file_writer.h b/test/rtp_file_writer.h
index 453b2776..19659cf 100644
--- a/test/rtp_file_writer.h
+++ b/test/rtp_file_writer.h
@@ -7,13 +7,13 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_RTP_FILE_WRITER_H_
-#define WEBRTC_TEST_RTP_FILE_WRITER_H_
+#ifndef TEST_RTP_FILE_WRITER_H_
+#define TEST_RTP_FILE_WRITER_H_
#include <string>
-#include "webrtc/common_types.h"
-#include "webrtc/test/rtp_file_reader.h"
+#include "common_types.h"
+#include "test/rtp_file_reader.h"
namespace webrtc {
namespace test {
@@ -30,4 +30,4 @@
};
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_RTP_FILE_WRITER_H_
+#endif // TEST_RTP_FILE_WRITER_H_
diff --git a/test/rtp_file_writer_unittest.cc b/test/rtp_file_writer_unittest.cc
index fa7d79d..aec10f7 100644
--- a/test/rtp_file_writer_unittest.cc
+++ b/test/rtp_file_writer_unittest.cc
@@ -12,10 +12,10 @@
#include <memory>
-#include "webrtc/test/gtest.h"
-#include "webrtc/test/rtp_file_reader.h"
-#include "webrtc/test/rtp_file_writer.h"
-#include "webrtc/test/testsupport/fileutils.h"
+#include "test/gtest.h"
+#include "test/rtp_file_reader.h"
+#include "test/rtp_file_writer.h"
+#include "test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/test/rtp_rtcp_observer.h b/test/rtp_rtcp_observer.h
index 8d6fefd..1fb2c06 100644
--- a/test/rtp_rtcp_observer.h
+++ b/test/rtp_rtcp_observer.h
@@ -7,22 +7,22 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_RTP_RTCP_OBSERVER_H_
-#define WEBRTC_TEST_RTP_RTCP_OBSERVER_H_
+#ifndef TEST_RTP_RTCP_OBSERVER_H_
+#define TEST_RTP_RTCP_OBSERVER_H_
#include <map>
#include <memory>
#include <vector>
-#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/event.h"
-#include "webrtc/system_wrappers/include/field_trial.h"
-#include "webrtc/test/constants.h"
-#include "webrtc/test/direct_transport.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/typedefs.h"
-#include "webrtc/call/video_send_stream.h"
+#include "modules/rtp_rtcp/include/rtp_header_parser.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/event.h"
+#include "system_wrappers/include/field_trial.h"
+#include "test/constants.h"
+#include "test/direct_transport.h"
+#include "test/gtest.h"
+#include "typedefs.h"
+#include "call/video_send_stream.h"
namespace {
const int kShortTimeoutMs = 500;
@@ -154,4 +154,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_RTP_RTCP_OBSERVER_H_
+#endif // TEST_RTP_RTCP_OBSERVER_H_
diff --git a/test/run_loop.cc b/test/run_loop.cc
index 92f85dd..0d00ecd 100644
--- a/test/run_loop.cc
+++ b/test/run_loop.cc
@@ -7,7 +7,7 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/run_loop.h"
+#include "test/run_loop.h"
#include <stdio.h>
diff --git a/test/run_loop.h b/test/run_loop.h
index 238e2dc..90063dc 100644
--- a/test/run_loop.h
+++ b/test/run_loop.h
@@ -7,8 +7,8 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_RUN_LOOP_H_
-#define WEBRTC_TEST_RUN_LOOP_H_
+#ifndef TEST_RUN_LOOP_H_
+#define TEST_RUN_LOOP_H_
namespace webrtc {
namespace test {
@@ -19,4 +19,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_RUN_LOOP_H_
+#endif // TEST_RUN_LOOP_H_
diff --git a/test/run_test.cc b/test/run_test.cc
index 4daea42..ba0bf34 100644
--- a/test/run_test.cc
+++ b/test/run_test.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/run_test.h"
+#include "test/run_test.h"
#include <stdio.h>
diff --git a/test/run_test.h b/test/run_test.h
index b515254..ed90857 100644
--- a/test/run_test.h
+++ b/test/run_test.h
@@ -7,8 +7,8 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_RUN_TEST_H
-#define WEBRTC_TEST_RUN_TEST_H
+#ifndef TEST_RUN_TEST_H_
+#define TEST_RUN_TEST_H_
namespace webrtc {
namespace test {
@@ -19,4 +19,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_RUN_TEST_H
+#endif // TEST_RUN_TEST_H_
diff --git a/test/single_threaded_task_queue.cc b/test/single_threaded_task_queue.cc
index bee5981..6ca57a2 100644
--- a/test/single_threaded_task_queue.cc
+++ b/test/single_threaded_task_queue.cc
@@ -8,14 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/single_threaded_task_queue.h"
+#include "test/single_threaded_task_queue.h"
#include <utility>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/ptr_util.h"
-#include "webrtc/rtc_base/safe_conversions.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/ptr_util.h"
+#include "rtc_base/safe_conversions.h"
+#include "rtc_base/timeutils.h"
namespace webrtc {
namespace test {
diff --git a/test/single_threaded_task_queue.h b/test/single_threaded_task_queue.h
index c078bdd..0721891 100644
--- a/test/single_threaded_task_queue.h
+++ b/test/single_threaded_task_queue.h
@@ -7,17 +7,17 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_SINGLE_THREADED_TASK_QUEUE_H_
-#define WEBRTC_TEST_SINGLE_THREADED_TASK_QUEUE_H_
+#ifndef TEST_SINGLE_THREADED_TASK_QUEUE_H_
+#define TEST_SINGLE_THREADED_TASK_QUEUE_H_
#include <functional>
#include <list>
#include <memory>
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/event.h"
-#include "webrtc/rtc_base/platform_thread.h"
-#include "webrtc/rtc_base/thread_checker.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/event.h"
+#include "rtc_base/platform_thread.h"
+#include "rtc_base/thread_checker.h"
namespace webrtc {
namespace test {
@@ -94,4 +94,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_SINGLE_THREADED_TASK_QUEUE_H_
+#endif // TEST_SINGLE_THREADED_TASK_QUEUE_H_
diff --git a/test/single_threaded_task_queue_unittest.cc b/test/single_threaded_task_queue_unittest.cc
index 8ad8b4f..5bd40d7 100644
--- a/test/single_threaded_task_queue_unittest.cc
+++ b/test/single_threaded_task_queue_unittest.cc
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/single_threaded_task_queue.h"
+#include "test/single_threaded_task_queue.h"
#include <atomic>
#include <memory>
#include <vector>
-#include "webrtc/rtc_base/event.h"
-#include "webrtc/rtc_base/ptr_util.h"
-#include "webrtc/test/gtest.h"
+#include "rtc_base/event.h"
+#include "rtc_base/ptr_util.h"
+#include "test/gtest.h"
namespace webrtc {
namespace test {
diff --git a/test/statistics.cc b/test/statistics.cc
index 0075d4c..c43dde9 100644
--- a/test/statistics.cc
+++ b/test/statistics.cc
@@ -7,7 +7,7 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/statistics.h"
+#include "test/statistics.h"
#include <math.h>
diff --git a/test/statistics.h b/test/statistics.h
index d4a111e..022bc9b 100644
--- a/test/statistics.h
+++ b/test/statistics.h
@@ -7,10 +7,10 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_STATISTICS_H_
-#define WEBRTC_TEST_STATISTICS_H_
+#ifndef TEST_STATISTICS_H_
+#define TEST_STATISTICS_H_
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
namespace webrtc {
namespace test {
@@ -33,4 +33,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_STATISTICS_H_
+#endif // TEST_STATISTICS_H_
diff --git a/test/test_main.cc b/test/test_main.cc
index 3790a68..8a6f266 100644
--- a/test/test_main.cc
+++ b/test/test_main.cc
@@ -8,17 +8,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/flags.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/system_wrappers/include/metrics_default.h"
-#include "webrtc/test/field_trial.h"
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/test/testsupport/fileutils.h"
-#include "webrtc/test/testsupport/trace_to_stderr.h"
+#include "rtc_base/flags.h"
+#include "rtc_base/logging.h"
+#include "system_wrappers/include/metrics_default.h"
+#include "test/field_trial.h"
+#include "test/gmock.h"
+#include "test/gtest.h"
+#include "test/testsupport/fileutils.h"
+#include "test/testsupport/trace_to_stderr.h"
#if defined(WEBRTC_IOS)
-#include "webrtc/test/ios/test_support.h"
+#include "test/ios/test_support.h"
DEFINE_string(NSTreatUnknownArgumentsAsOpen, "",
"Intentionally ignored flag intended for iOS simulator.");
diff --git a/test/testsupport/always_passing_unittest.cc b/test/testsupport/always_passing_unittest.cc
index 79a4869..e6318f7 100644
--- a/test/testsupport/always_passing_unittest.cc
+++ b/test/testsupport/always_passing_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/gtest.h"
+#include "test/gtest.h"
namespace webrtc {
diff --git a/test/testsupport/fileutils.cc b/test/testsupport/fileutils.cc
index deb9cf0..93cc5fd 100644
--- a/test/testsupport/fileutils.cc
+++ b/test/testsupport/fileutils.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/testsupport/fileutils.h"
+#include "test/testsupport/fileutils.h"
#include <assert.h>
@@ -21,7 +21,7 @@
#include "Shlwapi.h"
#include "WinDef.h"
-#include "webrtc/rtc_base/win32.h"
+#include "rtc_base/win32.h"
#define GET_CURRENT_DIR _getcwd
#else
#include <dirent.h>
@@ -42,8 +42,8 @@
#include <memory>
#include <utility>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/typedefs.h" // For architecture defines
+#include "rtc_base/checks.h"
+#include "typedefs.h" // For architecture defines
namespace webrtc {
namespace test {
diff --git a/test/testsupport/fileutils.h b/test/testsupport/fileutils.h
index 5ea7d31..f0560cf 100644
--- a/test/testsupport/fileutils.h
+++ b/test/testsupport/fileutils.h
@@ -10,13 +10,13 @@
#include <stdio.h>
-#ifndef WEBRTC_TEST_TESTSUPPORT_FILEUTILS_H_
-#define WEBRTC_TEST_TESTSUPPORT_FILEUTILS_H_
+#ifndef TEST_TESTSUPPORT_FILEUTILS_H_
+#define TEST_TESTSUPPORT_FILEUTILS_H_
#include <string>
#include <vector>
-#include "webrtc/api/optional.h"
+#include "api/optional.h"
namespace webrtc {
namespace test {
@@ -107,4 +107,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_TESTSUPPORT_FILEUTILS_H_
+#endif // TEST_TESTSUPPORT_FILEUTILS_H_
diff --git a/test/testsupport/fileutils_unittest.cc b/test/testsupport/fileutils_unittest.cc
index fb780be..79988c0 100644
--- a/test/testsupport/fileutils_unittest.cc
+++ b/test/testsupport/fileutils_unittest.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/testsupport/fileutils.h"
+#include "test/testsupport/fileutils.h"
#include <stdio.h>
@@ -17,10 +17,10 @@
#include <list>
#include <string>
-#include "webrtc/api/optional.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/pathutils.h"
-#include "webrtc/test/gtest.h"
+#include "api/optional.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/pathutils.h"
+#include "test/gtest.h"
#ifdef WIN32
#define chdir _chdir
diff --git a/test/testsupport/frame_reader.h b/test/testsupport/frame_reader.h
index a8fe73f..c9fa1c2 100644
--- a/test/testsupport/frame_reader.h
+++ b/test/testsupport/frame_reader.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_TESTSUPPORT_FRAME_READER_H_
-#define WEBRTC_TEST_TESTSUPPORT_FRAME_READER_H_
+#ifndef TEST_TESTSUPPORT_FRAME_READER_H_
+#define TEST_TESTSUPPORT_FRAME_READER_H_
#include <stdio.h>
#include <string>
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/typedefs.h"
+#include "rtc_base/scoped_ref_ptr.h"
+#include "typedefs.h"
namespace webrtc {
class I420Buffer;
@@ -72,4 +72,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_TESTSUPPORT_FRAME_READER_H_
+#endif // TEST_TESTSUPPORT_FRAME_READER_H_
diff --git a/test/testsupport/frame_writer.h b/test/testsupport/frame_writer.h
index faab50e..6c2c9ad 100644
--- a/test/testsupport/frame_writer.h
+++ b/test/testsupport/frame_writer.h
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_TESTSUPPORT_FRAME_WRITER_H_
-#define WEBRTC_TEST_TESTSUPPORT_FRAME_WRITER_H_
+#ifndef TEST_TESTSUPPORT_FRAME_WRITER_H_
+#define TEST_TESTSUPPORT_FRAME_WRITER_H_
#include <stdio.h>
#include <string>
-#include "webrtc/api/video/video_frame.h"
-#include "webrtc/typedefs.h"
+#include "api/video/video_frame.h"
+#include "typedefs.h"
namespace webrtc {
namespace test {
@@ -102,4 +102,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_TESTSUPPORT_FRAME_WRITER_H_
+#endif // TEST_TESTSUPPORT_FRAME_WRITER_H_
diff --git a/test/testsupport/iosfileutils.mm b/test/testsupport/iosfileutils.mm
index b3262c5..e1e5cd6 100644
--- a/test/testsupport/iosfileutils.mm
+++ b/test/testsupport/iosfileutils.mm
@@ -13,9 +13,9 @@
#import <Foundation/Foundation.h>
#include <string.h>
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/sdk/objc/Framework/Classes/Common/helpers.h"
-#include "webrtc/typedefs.h"
+#include "rtc_base/checks.h"
+#include "sdk/objc/Framework/Classes/Common/helpers.h"
+#include "typedefs.h"
namespace webrtc {
namespace test {
diff --git a/test/testsupport/jpeg_frame_writer.cc b/test/testsupport/jpeg_frame_writer.cc
index 8174cc2..c8f5c30 100644
--- a/test/testsupport/jpeg_frame_writer.cc
+++ b/test/testsupport/jpeg_frame_writer.cc
@@ -11,11 +11,11 @@
#include <stdio.h>
-#include "webrtc/common_types.h"
-#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/test/testsupport/frame_writer.h"
+#include "common_types.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "test/testsupport/frame_writer.h"
extern "C" {
#if defined(USE_SYSTEM_LIBJPEG)
diff --git a/test/testsupport/jpeg_frame_writer_ios.cc b/test/testsupport/jpeg_frame_writer_ios.cc
index 835a8ad..b87d7d1 100644
--- a/test/testsupport/jpeg_frame_writer_ios.cc
+++ b/test/testsupport/jpeg_frame_writer_ios.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/test/testsupport/frame_writer.h"
+#include "rtc_base/checks.h"
+#include "rtc_base/logging.h"
+#include "test/testsupport/frame_writer.h"
namespace webrtc {
diff --git a/test/testsupport/metrics/video_metrics.cc b/test/testsupport/metrics/video_metrics.cc
index e150f36..ea5d3f2 100644
--- a/test/testsupport/metrics/video_metrics.cc
+++ b/test/testsupport/metrics/video_metrics.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/testsupport/metrics/video_metrics.h"
+#include "test/testsupport/metrics/video_metrics.h"
#include <assert.h>
#include <stdio.h>
@@ -16,10 +16,10 @@
#include <algorithm> // min_element, max_element
#include <memory>
-#include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/api/video/video_frame.h"
-#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
-#include "webrtc/test/frame_utils.h"
+#include "api/video/i420_buffer.h"
+#include "api/video/video_frame.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
+#include "test/frame_utils.h"
#include "libyuv/convert.h"
namespace webrtc {
diff --git a/test/testsupport/metrics/video_metrics.h b/test/testsupport/metrics/video_metrics.h
index 8448ccf..f72ea9b 100644
--- a/test/testsupport/metrics/video_metrics.h
+++ b/test/testsupport/metrics/video_metrics.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TESTSUPPORT_METRICS_VIDEO_METRICS_H_
-#define WEBRTC_TESTSUPPORT_METRICS_VIDEO_METRICS_H_
+#ifndef TESTSUPPORT_METRICS_VIDEO_METRICS_H_
+#define TESTSUPPORT_METRICS_VIDEO_METRICS_H_
#include <limits>
#include <vector>
@@ -118,4 +118,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TESTSUPPORT_METRICS_VIDEO_METRICS_H_
+#endif // TESTSUPPORT_METRICS_VIDEO_METRICS_H_
diff --git a/test/testsupport/metrics/video_metrics_unittest.cc b/test/testsupport/metrics/video_metrics_unittest.cc
index 83a34a3..5b00458 100644
--- a/test/testsupport/metrics/video_metrics_unittest.cc
+++ b/test/testsupport/metrics/video_metrics_unittest.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/testsupport/metrics/video_metrics.h"
+#include "test/testsupport/metrics/video_metrics.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/test/testsupport/fileutils.h"
+#include "test/gtest.h"
+#include "test/testsupport/fileutils.h"
namespace webrtc {
diff --git a/test/testsupport/mock/mock_frame_reader.h b/test/testsupport/mock/mock_frame_reader.h
index 5fd2873..4ba416f 100644
--- a/test/testsupport/mock/mock_frame_reader.h
+++ b/test/testsupport/mock/mock_frame_reader.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_TESTSUPPORT_MOCK_MOCK_FRAME_READER_H_
-#define WEBRTC_TEST_TESTSUPPORT_MOCK_MOCK_FRAME_READER_H_
+#ifndef TEST_TESTSUPPORT_MOCK_MOCK_FRAME_READER_H_
+#define TEST_TESTSUPPORT_MOCK_MOCK_FRAME_READER_H_
-#include "webrtc/test/testsupport/frame_reader.h"
+#include "test/testsupport/frame_reader.h"
-#include "webrtc/test/gmock.h"
+#include "test/gmock.h"
namespace webrtc {
namespace test {
@@ -30,4 +30,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_TESTSUPPORT_MOCK_MOCK_FRAME_READER_H_
+#endif // TEST_TESTSUPPORT_MOCK_MOCK_FRAME_READER_H_
diff --git a/test/testsupport/mock/mock_frame_writer.h b/test/testsupport/mock/mock_frame_writer.h
index 8ba96bc..2f6602d 100644
--- a/test/testsupport/mock/mock_frame_writer.h
+++ b/test/testsupport/mock/mock_frame_writer.h
@@ -8,12 +8,12 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_TESTSUPPORT_MOCK_MOCK_FRAME_WRITER_H_
-#define WEBRTC_TEST_TESTSUPPORT_MOCK_MOCK_FRAME_WRITER_H_
+#ifndef TEST_TESTSUPPORT_MOCK_MOCK_FRAME_WRITER_H_
+#define TEST_TESTSUPPORT_MOCK_MOCK_FRAME_WRITER_H_
-#include "webrtc/test/testsupport/frame_writer.h"
+#include "test/testsupport/frame_writer.h"
-#include "webrtc/test/gmock.h"
+#include "test/gmock.h"
namespace webrtc {
namespace test {
@@ -29,4 +29,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_TESTSUPPORT_MOCK_MOCK_FRAME_WRITER_H_
+#endif // TEST_TESTSUPPORT_MOCK_MOCK_FRAME_WRITER_H_
diff --git a/test/testsupport/packet_reader.cc b/test/testsupport/packet_reader.cc
index e27ec22..ba52f94 100644
--- a/test/testsupport/packet_reader.cc
+++ b/test/testsupport/packet_reader.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/testsupport/packet_reader.h"
+#include "test/testsupport/packet_reader.h"
#include <assert.h>
#include <stdio.h>
diff --git a/test/testsupport/packet_reader.h b/test/testsupport/packet_reader.h
index b58db4d..23255fe 100644
--- a/test/testsupport/packet_reader.h
+++ b/test/testsupport/packet_reader.h
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_TESTSUPPORT_PACKET_READER_H_
-#define WEBRTC_TEST_TESTSUPPORT_PACKET_READER_H_
+#ifndef TEST_TESTSUPPORT_PACKET_READER_H_
+#define TEST_TESTSUPPORT_PACKET_READER_H_
#include <cstddef>
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
namespace webrtc {
namespace test {
@@ -51,4 +51,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_TESTSUPPORT_PACKET_READER_H_
+#endif // TEST_TESTSUPPORT_PACKET_READER_H_
diff --git a/test/testsupport/packet_reader_unittest.cc b/test/testsupport/packet_reader_unittest.cc
index ded1db3..3255151 100644
--- a/test/testsupport/packet_reader_unittest.cc
+++ b/test/testsupport/packet_reader_unittest.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/testsupport/packet_reader.h"
+#include "test/testsupport/packet_reader.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/test/testsupport/unittest_utils.h"
+#include "test/gtest.h"
+#include "test/testsupport/unittest_utils.h"
namespace webrtc {
namespace test {
diff --git a/test/testsupport/perf_test.cc b/test/testsupport/perf_test.cc
index 3266bb7..d79b4ec 100644
--- a/test/testsupport/perf_test.cc
+++ b/test/testsupport/perf_test.cc
@@ -12,7 +12,7 @@
// ResultsToString(), PrintResult(size_t value) and AppendResult(size_t value)
// have been modified. The remainder are identical to the Chromium version.
-#include "webrtc/test/testsupport/perf_test.h"
+#include "test/testsupport/perf_test.h"
#include <sstream>
#include <stdio.h>
diff --git a/test/testsupport/perf_test.h b/test/testsupport/perf_test.h
index 6e49ac9..e94f891 100644
--- a/test/testsupport/perf_test.h
+++ b/test/testsupport/perf_test.h
@@ -12,8 +12,8 @@
// Several functions have been removed; the prototypes of the remainder have
// not been changed.
-#ifndef WEBRTC_TEST_TESTSUPPORT_PERF_TEST_H_
-#define WEBRTC_TEST_TESTSUPPORT_PERF_TEST_H_
+#ifndef TEST_TESTSUPPORT_PERF_TEST_H_
+#define TEST_TESTSUPPORT_PERF_TEST_H_
#include <sstream>
#include <string>
@@ -137,4 +137,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_TESTSUPPORT_PERF_TEST_H_
+#endif // TEST_TESTSUPPORT_PERF_TEST_H_
diff --git a/test/testsupport/perf_test_unittest.cc b/test/testsupport/perf_test_unittest.cc
index 4516b99..3ad4197 100644
--- a/test/testsupport/perf_test_unittest.cc
+++ b/test/testsupport/perf_test_unittest.cc
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/testsupport/perf_test.h"
+#include "test/testsupport/perf_test.h"
#include <string>
-#include "webrtc/test/gtest.h"
+#include "test/gtest.h"
namespace webrtc {
namespace test {
diff --git a/test/testsupport/test_output.cc b/test/testsupport/test_output.cc
index f9d64b4..882e2c0 100644
--- a/test/testsupport/test_output.cc
+++ b/test/testsupport/test_output.cc
@@ -8,15 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/testsupport/test_output.h"
+#include "test/testsupport/test_output.h"
#include <string.h>
-#include "webrtc/rtc_base/file.h"
-#include "webrtc/rtc_base/flags.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/pathutils.h"
-#include "webrtc/test/testsupport/fileutils.h"
+#include "rtc_base/file.h"
+#include "rtc_base/flags.h"
+#include "rtc_base/logging.h"
+#include "rtc_base/pathutils.h"
+#include "test/testsupport/fileutils.h"
namespace {
const std::string& DefaultOutputPath() {
diff --git a/test/testsupport/test_output.h b/test/testsupport/test_output.h
index c502ea3..e20b656 100644
--- a/test/testsupport/test_output.h
+++ b/test/testsupport/test_output.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_TESTSUPPORT_TEST_OUTPUT_H_
-#define WEBRTC_TEST_TESTSUPPORT_TEST_OUTPUT_H_
+#ifndef TEST_TESTSUPPORT_TEST_OUTPUT_H_
+#define TEST_TESTSUPPORT_TEST_OUTPUT_H_
#include <stdlib.h>
@@ -36,4 +36,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_TESTSUPPORT_TEST_OUTPUT_H_
+#endif // TEST_TESTSUPPORT_TEST_OUTPUT_H_
diff --git a/test/testsupport/test_output_unittest.cc b/test/testsupport/test_output_unittest.cc
index a082dc1..82898b9 100644
--- a/test/testsupport/test_output_unittest.cc
+++ b/test/testsupport/test_output_unittest.cc
@@ -8,17 +8,17 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/testsupport/test_output.h"
+#include "test/testsupport/test_output.h"
#include <string.h>
#include <string>
-#include "webrtc/rtc_base/file.h"
-#include "webrtc/rtc_base/flags.h"
-#include "webrtc/rtc_base/pathutils.h"
-#include "webrtc/rtc_base/platform_file.h"
-#include "webrtc/test/gtest.h"
+#include "rtc_base/file.h"
+#include "rtc_base/flags.h"
+#include "rtc_base/pathutils.h"
+#include "rtc_base/platform_file.h"
+#include "test/gtest.h"
DECLARE_string(test_output_dir);
diff --git a/test/testsupport/trace_to_stderr.cc b/test/testsupport/trace_to_stderr.cc
index 7338441..5b75d1b 100644
--- a/test/testsupport/trace_to_stderr.cc
+++ b/test/testsupport/trace_to_stderr.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/testsupport/trace_to_stderr.h"
+#include "test/testsupport/trace_to_stderr.h"
#include <assert.h>
#include <stdio.h>
diff --git a/test/testsupport/trace_to_stderr.h b/test/testsupport/trace_to_stderr.h
index a713b79..bb8a53a 100644
--- a/test/testsupport/trace_to_stderr.h
+++ b/test/testsupport/trace_to_stderr.h
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_TEST_SUPPORT_TRACE_TO_STDERR_H_
-#define WEBRTC_TEST_TEST_SUPPORT_TRACE_TO_STDERR_H_
+#ifndef TEST_TEST_SUPPORT_TRACE_TO_STDERR_H_
+#define TEST_TEST_SUPPORT_TRACE_TO_STDERR_H_
-#include "webrtc/system_wrappers/include/trace.h"
+#include "system_wrappers/include/trace.h"
namespace webrtc {
namespace test {
@@ -49,4 +49,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_TEST_SUPPORT_TRACE_TO_STDERR_H_
+#endif // TEST_TEST_SUPPORT_TRACE_TO_STDERR_H_
diff --git a/test/testsupport/unittest_utils.h b/test/testsupport/unittest_utils.h
index ba6db98..5fee2ca 100644
--- a/test/testsupport/unittest_utils.h
+++ b/test/testsupport/unittest_utils.h
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_TESTSUPPORT_UNITTEST_UTILS_H_
-#define WEBRTC_TEST_TESTSUPPORT_UNITTEST_UTILS_H_
+#ifndef TEST_TESTSUPPORT_UNITTEST_UTILS_H_
+#define TEST_TESTSUPPORT_UNITTEST_UTILS_H_
namespace webrtc {
namespace test {
@@ -53,4 +53,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_TESTSUPPORT_UNITTEST_UTILS_H_
+#endif // TEST_TESTSUPPORT_UNITTEST_UTILS_H_
diff --git a/test/testsupport/y4m_frame_writer.cc b/test/testsupport/y4m_frame_writer.cc
index e338982..e0c1ed5 100644
--- a/test/testsupport/y4m_frame_writer.cc
+++ b/test/testsupport/y4m_frame_writer.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/test/testsupport/frame_writer.h"
+#include "rtc_base/checks.h"
+#include "test/testsupport/frame_writer.h"
namespace webrtc {
namespace test {
diff --git a/test/testsupport/y4m_frame_writer_unittest.cc b/test/testsupport/y4m_frame_writer_unittest.cc
index a4e4172..d9ec09a 100644
--- a/test/testsupport/y4m_frame_writer_unittest.cc
+++ b/test/testsupport/y4m_frame_writer_unittest.cc
@@ -11,9 +11,9 @@
#include <memory>
#include <string>
-#include "webrtc/test/gtest.h"
-#include "webrtc/test/testsupport/fileutils.h"
-#include "webrtc/test/testsupport/frame_writer.h"
+#include "test/gtest.h"
+#include "test/testsupport/fileutils.h"
+#include "test/testsupport/frame_writer.h"
namespace webrtc {
namespace test {
diff --git a/test/testsupport/yuv_frame_reader.cc b/test/testsupport/yuv_frame_reader.cc
index 3fe481e..60f9994 100644
--- a/test/testsupport/yuv_frame_reader.cc
+++ b/test/testsupport/yuv_frame_reader.cc
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/testsupport/frame_reader.h"
+#include "test/testsupport/frame_reader.h"
-#include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/test/frame_utils.h"
-#include "webrtc/test/testsupport/fileutils.h"
+#include "api/video/i420_buffer.h"
+#include "test/frame_utils.h"
+#include "test/testsupport/fileutils.h"
namespace webrtc {
namespace test {
diff --git a/test/testsupport/yuv_frame_reader_unittest.cc b/test/testsupport/yuv_frame_reader_unittest.cc
index 87d51c2..dd4b980 100644
--- a/test/testsupport/yuv_frame_reader_unittest.cc
+++ b/test/testsupport/yuv_frame_reader_unittest.cc
@@ -11,10 +11,10 @@
#include <memory>
#include <string>
-#include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/test/gtest.h"
-#include "webrtc/test/testsupport/fileutils.h"
-#include "webrtc/test/testsupport/frame_reader.h"
+#include "api/video/i420_buffer.h"
+#include "test/gtest.h"
+#include "test/testsupport/fileutils.h"
+#include "test/testsupport/frame_reader.h"
namespace webrtc {
namespace test {
diff --git a/test/testsupport/yuv_frame_writer.cc b/test/testsupport/yuv_frame_writer.cc
index 84fba7e..1bd343c 100644
--- a/test/testsupport/yuv_frame_writer.cc
+++ b/test/testsupport/yuv_frame_writer.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/test/testsupport/frame_writer.h"
+#include "rtc_base/checks.h"
+#include "test/testsupport/frame_writer.h"
namespace webrtc {
namespace test {
diff --git a/test/testsupport/yuv_frame_writer_unittest.cc b/test/testsupport/yuv_frame_writer_unittest.cc
index 5e3cc5c..49b595e 100644
--- a/test/testsupport/yuv_frame_writer_unittest.cc
+++ b/test/testsupport/yuv_frame_writer_unittest.cc
@@ -10,9 +10,9 @@
#include <memory>
-#include "webrtc/test/gtest.h"
-#include "webrtc/test/testsupport/fileutils.h"
-#include "webrtc/test/testsupport/frame_writer.h"
+#include "test/gtest.h"
+#include "test/testsupport/fileutils.h"
+#include "test/testsupport/frame_writer.h"
namespace webrtc {
namespace test {
diff --git a/test/vcm_capturer.cc b/test/vcm_capturer.cc
index 0c6ded0..e04dbc0 100644
--- a/test/vcm_capturer.cc
+++ b/test/vcm_capturer.cc
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/vcm_capturer.h"
+#include "test/vcm_capturer.h"
-#include "webrtc/modules/video_capture/video_capture_factory.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/call/video_send_stream.h"
+#include "modules/video_capture/video_capture_factory.h"
+#include "rtc_base/logging.h"
+#include "call/video_send_stream.h"
namespace webrtc {
namespace test {
diff --git a/test/vcm_capturer.h b/test/vcm_capturer.h
index 2b4323c..356405c 100644
--- a/test/vcm_capturer.h
+++ b/test/vcm_capturer.h
@@ -7,17 +7,17 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_VCM_CAPTURER_H_
-#define WEBRTC_TEST_VCM_CAPTURER_H_
+#ifndef TEST_VCM_CAPTURER_H_
+#define TEST_VCM_CAPTURER_H_
#include <memory>
-#include "webrtc/common_types.h"
-#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
-#include "webrtc/modules/video_capture/video_capture.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/test/video_capturer.h"
+#include "common_types.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
+#include "modules/video_capture/video_capture.h"
+#include "rtc_base/criticalsection.h"
+#include "rtc_base/scoped_ref_ptr.h"
+#include "test/video_capturer.h"
namespace webrtc {
namespace test {
@@ -58,4 +58,4 @@
} // test
} // webrtc
-#endif // WEBRTC_TEST_VCM_CAPTURER_H_
+#endif // TEST_VCM_CAPTURER_H_
diff --git a/test/video_capturer.cc b/test/video_capturer.cc
index cb75fa2..b95936f 100644
--- a/test/video_capturer.cc
+++ b/test/video_capturer.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/video_capturer.h"
+#include "test/video_capturer.h"
-#include "webrtc/rtc_base/basictypes.h"
-#include "webrtc/rtc_base/constructormagic.h"
+#include "rtc_base/basictypes.h"
+#include "rtc_base/constructormagic.h"
namespace webrtc {
namespace test {
diff --git a/test/video_capturer.h b/test/video_capturer.h
index deeb5c8..eba5d61 100644
--- a/test/video_capturer.h
+++ b/test/video_capturer.h
@@ -7,19 +7,19 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_VIDEO_CAPTURER_H_
-#define WEBRTC_TEST_VIDEO_CAPTURER_H_
+#ifndef TEST_VIDEO_CAPTURER_H_
+#define TEST_VIDEO_CAPTURER_H_
#include <stddef.h>
#include <memory>
-#include "webrtc/api/optional.h"
-#include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/api/video/video_frame.h"
-#include "webrtc/media/base/videoadapter.h"
-#include "webrtc/media/base/videosourceinterface.h"
-#include "webrtc/rtc_base/criticalsection.h"
+#include "api/optional.h"
+#include "api/video/i420_buffer.h"
+#include "api/video/video_frame.h"
+#include "media/base/videoadapter.h"
+#include "media/base/videosourceinterface.h"
+#include "rtc_base/criticalsection.h"
namespace cricket {
class VideoAdapter;
@@ -50,4 +50,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_VIDEO_CAPTURER_H_
+#endif // TEST_VIDEO_CAPTURER_H_
diff --git a/test/video_codec_settings.h b/test/video_codec_settings.h
index 1487393..b52fbc7 100644
--- a/test/video_codec_settings.h
+++ b/test/video_codec_settings.h
@@ -7,10 +7,10 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_VIDEO_CODEC_SETTINGS_H_
-#define WEBRTC_TEST_VIDEO_CODEC_SETTINGS_H_
+#ifndef TEST_VIDEO_CODEC_SETTINGS_H_
+#define TEST_VIDEO_CODEC_SETTINGS_H_
-#include "webrtc/api/video_codecs/video_encoder.h"
+#include "api/video_codecs/video_encoder.h"
namespace webrtc {
namespace test {
@@ -108,4 +108,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_VIDEO_CODEC_SETTINGS_H_
+#endif // TEST_VIDEO_CODEC_SETTINGS_H_
diff --git a/test/video_renderer.cc b/test/video_renderer.cc
index 7f04683..ade066b 100644
--- a/test/video_renderer.cc
+++ b/test/video_renderer.cc
@@ -7,11 +7,11 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/video_renderer.h"
+#include "test/video_renderer.h"
// TODO(pbos): Android renderer
-#include "webrtc/typedefs.h"
+#include "typedefs.h"
namespace webrtc {
namespace test {
diff --git a/test/video_renderer.h b/test/video_renderer.h
index 49d2fa3..6a00e88 100644
--- a/test/video_renderer.h
+++ b/test/video_renderer.h
@@ -7,12 +7,12 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_VIDEO_RENDERER_H_
-#define WEBRTC_TEST_VIDEO_RENDERER_H_
+#ifndef TEST_VIDEO_RENDERER_H_
+#define TEST_VIDEO_RENDERER_H_
#include <stddef.h>
-#include "webrtc/media/base/videosinkinterface.h"
+#include "media/base/videosinkinterface.h"
namespace webrtc {
class VideoFrame;
@@ -38,4 +38,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_VIDEO_RENDERER_H_
+#endif // TEST_VIDEO_RENDERER_H_
diff --git a/test/win/d3d_renderer.cc b/test/win/d3d_renderer.cc
index e73bad6..1f791a9 100644
--- a/test/win/d3d_renderer.cc
+++ b/test/win/d3d_renderer.cc
@@ -7,10 +7,10 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/win/d3d_renderer.h"
+#include "test/win/d3d_renderer.h"
-#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
-#include "webrtc/rtc_base/checks.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
+#include "rtc_base/checks.h"
namespace webrtc {
namespace test {
diff --git a/test/win/d3d_renderer.h b/test/win/d3d_renderer.h
index c3e9f7d..e20e778 100644
--- a/test/win/d3d_renderer.h
+++ b/test/win/d3d_renderer.h
@@ -7,16 +7,16 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_TEST_WIN_D3D_RENDERER_H_
-#define WEBRTC_TEST_WIN_D3D_RENDERER_H_
+#ifndef TEST_WIN_D3D_RENDERER_H_
+#define TEST_WIN_D3D_RENDERER_H_
#include <Windows.h>
#include <d3d9.h>
#pragma comment(lib, "d3d9.lib") // located in DirectX SDK
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
-#include "webrtc/test/video_renderer.h"
-#include "webrtc/typedefs.h"
+#include "rtc_base/scoped_ref_ptr.h"
+#include "test/video_renderer.h"
+#include "typedefs.h"
namespace webrtc {
namespace test {
@@ -50,4 +50,4 @@
} // namespace test
} // namespace webrtc
-#endif // WEBRTC_TEST_WIN_D3D_RENDERER_H_
+#endif // TEST_WIN_D3D_RENDERER_H_
diff --git a/test/win/run_loop_win.cc b/test/win/run_loop_win.cc
index ec29cc5..494adc4 100644
--- a/test/win/run_loop_win.cc
+++ b/test/win/run_loop_win.cc
@@ -7,7 +7,7 @@
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/test/run_loop.h"
+#include "test/run_loop.h"
#include <assert.h>
