Update includes for webrtc/{base => rtc_base} rename (2/3)
I used a command like this to update the paths:
perl -pi -e "s/webrtc\/base/webrtc\/rtc_base/g" `find webrtc/rtc_base -name "*.cc" -o -name "*.h"`
BUG=webrtc:7634
NOPRESUBMIT=True # cpplint errors that aren't caused by this CL.
Review-Url: https://codereview.webrtc.org/2969623003
Cr-Commit-Position: refs/heads/master@{#18870}
diff --git a/webrtc/audio/audio_receive_stream.cc b/webrtc/audio/audio_receive_stream.cc
index 079e971..6dedca5 100644
--- a/webrtc/audio/audio_receive_stream.cc
+++ b/webrtc/audio/audio_receive_stream.cc
@@ -17,13 +17,13 @@
#include "webrtc/audio/audio_send_stream.h"
#include "webrtc/audio/audio_state.h"
#include "webrtc/audio/conversion.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/timeutils.h"
#include "webrtc/call/rtp_stream_receiver_controller_interface.h"
#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/timeutils.h"
#include "webrtc/voice_engine/channel_proxy.h"
#include "webrtc/voice_engine/include/voe_base.h"
#include "webrtc/voice_engine/voice_engine_impl.h"
diff --git a/webrtc/audio/audio_receive_stream.h b/webrtc/audio/audio_receive_stream.h
index 92c4763..dc7992f 100644
--- a/webrtc/audio/audio_receive_stream.h
+++ b/webrtc/audio/audio_receive_stream.h
@@ -16,11 +16,11 @@
#include "webrtc/api/audio/audio_mixer.h"
#include "webrtc/audio/audio_state.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/thread_checker.h"
#include "webrtc/call/audio_receive_stream.h"
#include "webrtc/call/rtp_packet_sink_interface.h"
#include "webrtc/call/syncable.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/thread_checker.h"
namespace webrtc {
class PacketRouter;
diff --git a/webrtc/audio/audio_send_stream.cc b/webrtc/audio/audio_send_stream.cc
index 36ad63d..1861cc0 100644
--- a/webrtc/audio/audio_send_stream.cc
+++ b/webrtc/audio/audio_send_stream.cc
@@ -17,17 +17,17 @@
#include "webrtc/audio/audio_state.h"
#include "webrtc/audio/conversion.h"
#include "webrtc/audio/scoped_voe_interface.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/function_view.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/task_queue.h"
-#include "webrtc/base/timeutils.h"
#include "webrtc/call/rtp_transport_controller_send_interface.h"
#include "webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h"
#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
#include "webrtc/modules/congestion_controller/include/send_side_congestion_controller.h"
#include "webrtc/modules/pacing/paced_sender.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/function_view.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/task_queue.h"
+#include "webrtc/rtc_base/timeutils.h"
#include "webrtc/voice_engine/channel_proxy.h"
#include "webrtc/voice_engine/include/voe_base.h"
#include "webrtc/voice_engine/transmit_mixer.h"
diff --git a/webrtc/audio/audio_send_stream.h b/webrtc/audio/audio_send_stream.h
index 881c68e..70cf1c8 100644
--- a/webrtc/audio/audio_send_stream.h
+++ b/webrtc/audio/audio_send_stream.h
@@ -14,12 +14,12 @@
#include <memory>
#include <vector>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/thread_checker.h"
#include "webrtc/call/audio_send_stream.h"
#include "webrtc/call/audio_state.h"
#include "webrtc/call/bitrate_allocator.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/thread_checker.h"
#include "webrtc/voice_engine/transport_feedback_packet_loss_tracker.h"
namespace webrtc {
diff --git a/webrtc/audio/audio_send_stream_unittest.cc b/webrtc/audio/audio_send_stream_unittest.cc
index b685cfb..b906443 100644
--- a/webrtc/audio/audio_send_stream_unittest.cc
+++ b/webrtc/audio/audio_send_stream_unittest.cc
@@ -15,8 +15,6 @@
#include "webrtc/audio/audio_send_stream.h"
#include "webrtc/audio/audio_state.h"
#include "webrtc/audio/conversion.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/task_queue.h"
#include "webrtc/call/fake_rtp_transport_controller_send.h"
#include "webrtc/call/rtp_transport_controller_send_interface.h"
#include "webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h"
@@ -27,6 +25,8 @@
#include "webrtc/modules/pacing/paced_sender.h"
#include "webrtc/modules/rtp_rtcp/mocks/mock_rtcp_rtt_stats.h"
#include "webrtc/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/task_queue.h"
#include "webrtc/test/gtest.h"
#include "webrtc/test/mock_audio_encoder.h"
#include "webrtc/test/mock_audio_encoder_factory.h"
diff --git a/webrtc/audio/audio_state.cc b/webrtc/audio/audio_state.cc
index 961e772..90147ca 100644
--- a/webrtc/audio/audio_state.cc
+++ b/webrtc/audio/audio_state.cc
@@ -10,10 +10,10 @@
#include "webrtc/audio/audio_state.h"
-#include "webrtc/base/atomicops.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
#include "webrtc/modules/audio_device/include/audio_device.h"
+#include "webrtc/rtc_base/atomicops.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/voice_engine/include/voe_errors.h"
namespace webrtc {
diff --git a/webrtc/audio/audio_state.h b/webrtc/audio/audio_state.h
index 8a98d57..90bbadb 100644
--- a/webrtc/audio/audio_state.h
+++ b/webrtc/audio/audio_state.h
@@ -13,10 +13,10 @@
#include "webrtc/audio/audio_transport_proxy.h"
#include "webrtc/audio/scoped_voe_interface.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/thread_checker.h"
#include "webrtc/call/audio_state.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/thread_checker.h"
#include "webrtc/voice_engine/include/voe_base.h"
namespace webrtc {
diff --git a/webrtc/audio/audio_transport_proxy.h b/webrtc/audio/audio_transport_proxy.h
index fda9339..7d2dea1 100644
--- a/webrtc/audio/audio_transport_proxy.h
+++ b/webrtc/audio/audio_transport_proxy.h
@@ -12,11 +12,11 @@
#define WEBRTC_AUDIO_AUDIO_TRANSPORT_PROXY_H_
#include "webrtc/api/audio/audio_mixer.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/scoped_ref_ptr.h"
#include "webrtc/common_audio/resampler/include/push_resampler.h"
#include "webrtc/modules/audio_device/include/audio_device_defines.h"
#include "webrtc/modules/audio_processing/include/audio_processing.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
namespace webrtc {
diff --git a/webrtc/audio/scoped_voe_interface.h b/webrtc/audio/scoped_voe_interface.h
index 1029337..59631bf 100644
--- a/webrtc/audio/scoped_voe_interface.h
+++ b/webrtc/audio/scoped_voe_interface.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_AUDIO_SCOPED_VOE_INTERFACE_H_
#define WEBRTC_AUDIO_SCOPED_VOE_INTERFACE_H_
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
diff --git a/webrtc/audio/utility/audio_frame_operations.cc b/webrtc/audio/utility/audio_frame_operations.cc
index beb3e4c..1299e04 100644
--- a/webrtc/audio/utility/audio_frame_operations.cc
+++ b/webrtc/audio/utility/audio_frame_operations.cc
@@ -12,9 +12,9 @@
#include <algorithm>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/safe_conversions.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/safe_conversions.h"
namespace webrtc {
namespace {
diff --git a/webrtc/audio/utility/audio_frame_operations_unittest.cc b/webrtc/audio/utility/audio_frame_operations_unittest.cc
index e3e9804..deab9bd 100644
--- a/webrtc/audio/utility/audio_frame_operations_unittest.cc
+++ b/webrtc/audio/utility/audio_frame_operations_unittest.cc
@@ -9,8 +9,8 @@
*/
#include "webrtc/audio/utility/audio_frame_operations.h"
-#include "webrtc/base/checks.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/checks.h"
#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/webrtc/call/audio_receive_stream.h b/webrtc/call/audio_receive_stream.h
index e3bdd45..5837b2e 100644
--- a/webrtc/call/audio_receive_stream.h
+++ b/webrtc/call/audio_receive_stream.h
@@ -19,10 +19,10 @@
#include "webrtc/api/audio_codecs/audio_decoder_factory.h"
#include "webrtc/api/call/transport.h"
#include "webrtc/api/rtpreceiverinterface.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/scoped_ref_ptr.h"
#include "webrtc/common_types.h"
#include "webrtc/config.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/webrtc/call/audio_send_stream.h b/webrtc/call/audio_send_stream.h
index 6c7e707..e0fe47d 100644
--- a/webrtc/call/audio_send_stream.h
+++ b/webrtc/call/audio_send_stream.h
@@ -18,8 +18,8 @@
#include "webrtc/api/audio_codecs/audio_encoder_factory.h"
#include "webrtc/api/audio_codecs/audio_format.h"
#include "webrtc/api/call/transport.h"
-#include "webrtc/base/optional.h"
#include "webrtc/config.h"
+#include "webrtc/rtc_base/optional.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/webrtc/call/audio_state.h b/webrtc/call/audio_state.h
index 32b7ada..826b31d 100644
--- a/webrtc/call/audio_state.h
+++ b/webrtc/call/audio_state.h
@@ -11,8 +11,8 @@
#define WEBRTC_CALL_AUDIO_STATE_H_
#include "webrtc/api/audio/audio_mixer.h"
-#include "webrtc/base/refcount.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/refcount.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
namespace webrtc {
diff --git a/webrtc/call/bitrate_allocator.cc b/webrtc/call/bitrate_allocator.cc
index 9aecc6e..1e22c00 100644
--- a/webrtc/call/bitrate_allocator.cc
+++ b/webrtc/call/bitrate_allocator.cc
@@ -14,9 +14,9 @@
#include <algorithm>
#include <utility>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/system_wrappers/include/metrics.h"
diff --git a/webrtc/call/bitrate_allocator.h b/webrtc/call/bitrate_allocator.h
index e92eac9..b36d38e 100644
--- a/webrtc/call/bitrate_allocator.h
+++ b/webrtc/call/bitrate_allocator.h
@@ -17,7 +17,7 @@
#include <utility>
#include <vector>
-#include "webrtc/base/sequenced_task_checker.h"
+#include "webrtc/rtc_base/sequenced_task_checker.h"
namespace webrtc {
diff --git a/webrtc/call/bitrate_estimator_tests.cc b/webrtc/call/bitrate_estimator_tests.cc
index ef7aba8..de12ef7 100644
--- a/webrtc/call/bitrate_estimator_tests.cc
+++ b/webrtc/call/bitrate_estimator_tests.cc
@@ -12,11 +12,11 @@
#include <memory>
#include <string>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/thread_annotations.h"
#include "webrtc/call/call.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/thread_annotations.h"
#include "webrtc/test/call_test.h"
#include "webrtc/test/direct_transport.h"
#include "webrtc/test/encoder_settings.h"
diff --git a/webrtc/call/call.cc b/webrtc/call/call.cc
index b4a9456..8f9cb2b 100644
--- a/webrtc/call/call.cc
+++ b/webrtc/call/call.cc
@@ -20,17 +20,6 @@
#include "webrtc/audio/audio_send_stream.h"
#include "webrtc/audio/audio_state.h"
#include "webrtc/audio/scoped_voe_interface.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/location.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/task_queue.h"
-#include "webrtc/base/thread_annotations.h"
-#include "webrtc/base/thread_checker.h"
-#include "webrtc/base/trace_event.h"
#include "webrtc/call/bitrate_allocator.h"
#include "webrtc/call/call.h"
#include "webrtc/call/flexfec_receive_stream_impl.h"
@@ -47,6 +36,17 @@
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
#include "webrtc/modules/utility/include/process_thread.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/location.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/task_queue.h"
+#include "webrtc/rtc_base/thread_annotations.h"
+#include "webrtc/rtc_base/thread_checker.h"
+#include "webrtc/rtc_base/trace_event.h"
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/system_wrappers/include/cpu_info.h"
#include "webrtc/system_wrappers/include/metrics.h"
diff --git a/webrtc/call/call.h b/webrtc/call/call.h
index 842ed60..86142f0 100644
--- a/webrtc/call/call.h
+++ b/webrtc/call/call.h
@@ -16,15 +16,15 @@
#include <vector>
#include "webrtc/api/rtcerror.h"
-#include "webrtc/base/networkroute.h"
-#include "webrtc/base/platform_file.h"
-#include "webrtc/base/socket.h"
#include "webrtc/call/audio_receive_stream.h"
#include "webrtc/call/audio_send_stream.h"
#include "webrtc/call/audio_state.h"
#include "webrtc/call/flexfec_receive_stream.h"
#include "webrtc/call/rtp_transport_controller_send_interface.h"
#include "webrtc/common_types.h"
+#include "webrtc/rtc_base/networkroute.h"
+#include "webrtc/rtc_base/platform_file.h"
+#include "webrtc/rtc_base/socket.h"
#include "webrtc/video_receive_stream.h"
#include "webrtc/video_send_stream.h"
diff --git a/webrtc/call/call_perf_tests.cc b/webrtc/call/call_perf_tests.cc
index 0c0a0cf..f8461bf 100644
--- a/webrtc/call/call_perf_tests.cc
+++ b/webrtc/call/call_perf_tests.cc
@@ -14,15 +14,15 @@
#include <string>
#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/thread_annotations.h"
#include "webrtc/call/call.h"
#include "webrtc/config.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
#include "webrtc/modules/audio_coding/include/audio_coding_module.h"
#include "webrtc/modules/audio_mixer/audio_mixer_impl.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/thread_annotations.h"
#include "webrtc/system_wrappers/include/metrics_default.h"
#include "webrtc/test/call_test.h"
#include "webrtc/test/direct_transport.h"
diff --git a/webrtc/call/call_unittest.cc b/webrtc/call/call_unittest.cc
index 5267e7a..2524de6 100644
--- a/webrtc/call/call_unittest.cc
+++ b/webrtc/call/call_unittest.cc
@@ -14,7 +14,6 @@
#include <utility>
#include "webrtc/api/test/mock_audio_mixer.h"
-#include "webrtc/base/ptr_util.h"
#include "webrtc/call/audio_state.h"
#include "webrtc/call/call.h"
#include "webrtc/call/fake_rtp_transport_controller_send.h"
@@ -23,6 +22,7 @@
#include "webrtc/modules/audio_mixer/audio_mixer_impl.h"
#include "webrtc/modules/congestion_controller/include/mock/mock_send_side_congestion_controller.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
+#include "webrtc/rtc_base/ptr_util.h"
#include "webrtc/test/gtest.h"
#include "webrtc/test/mock_audio_decoder_factory.h"
#include "webrtc/test/mock_transport.h"
diff --git a/webrtc/call/flexfec_receive_stream_impl.cc b/webrtc/call/flexfec_receive_stream_impl.cc
index c73d9e9..a1e9bc6 100644
--- a/webrtc/call/flexfec_receive_stream_impl.cc
+++ b/webrtc/call/flexfec_receive_stream_impl.cc
@@ -12,15 +12,15 @@
#include <string>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/location.h"
-#include "webrtc/base/logging.h"
#include "webrtc/call/rtp_stream_receiver_controller_interface.h"
#include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h"
#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
#include "webrtc/modules/utility/include/process_thread.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/location.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/system_wrappers/include/clock.h"
namespace webrtc {
diff --git a/webrtc/call/flexfec_receive_stream_impl.h b/webrtc/call/flexfec_receive_stream_impl.h
index a89940f..81c09d6 100644
--- a/webrtc/call/flexfec_receive_stream_impl.h
+++ b/webrtc/call/flexfec_receive_stream_impl.h
@@ -13,9 +13,9 @@
#include <memory>
-#include "webrtc/base/criticalsection.h"
#include "webrtc/call/flexfec_receive_stream.h"
#include "webrtc/call/rtp_packet_sink_interface.h"
+#include "webrtc/rtc_base/criticalsection.h"
namespace webrtc {
diff --git a/webrtc/call/flexfec_receive_stream_unittest.cc b/webrtc/call/flexfec_receive_stream_unittest.cc
index ba41406..c8e0116 100644
--- a/webrtc/call/flexfec_receive_stream_unittest.cc
+++ b/webrtc/call/flexfec_receive_stream_unittest.cc
@@ -10,7 +10,6 @@
#include <stdint.h>
-#include "webrtc/base/array_view.h"
#include "webrtc/call/flexfec_receive_stream_impl.h"
#include "webrtc/call/rtp_stream_receiver_controller.h"
#include "webrtc/modules/pacing/packet_router.h"
@@ -20,6 +19,7 @@
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
#include "webrtc/modules/utility/include/mock/mock_process_thread.h"
+#include "webrtc/rtc_base/array_view.h"
#include "webrtc/test/gmock.h"
#include "webrtc/test/gtest.h"
#include "webrtc/test/mock_transport.h"
diff --git a/webrtc/call/rampup_tests.cc b/webrtc/call/rampup_tests.cc
index 5128d50..a50abee 100644
--- a/webrtc/call/rampup_tests.cc
+++ b/webrtc/call/rampup_tests.cc
@@ -10,9 +10,9 @@
#include "webrtc/call/rampup_tests.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/platform_thread.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/platform_thread.h"
#include "webrtc/test/encoder_settings.h"
#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/perf_test.h"
diff --git a/webrtc/call/rampup_tests.h b/webrtc/call/rampup_tests.h
index 6710dd1..eedef7b 100644
--- a/webrtc/call/rampup_tests.h
+++ b/webrtc/call/rampup_tests.h
@@ -15,9 +15,9 @@
#include <string>
#include <vector>
-#include "webrtc/base/event.h"
#include "webrtc/call/call.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
+#include "webrtc/rtc_base/event.h"
#include "webrtc/test/call_test.h"
namespace webrtc {
diff --git a/webrtc/call/rsid_resolution_observer.h b/webrtc/call/rsid_resolution_observer.h
index b14fa9d..ea08045 100644
--- a/webrtc/call/rsid_resolution_observer.h
+++ b/webrtc/call/rsid_resolution_observer.h
@@ -12,7 +12,7 @@
#include <string>
-#include "webrtc/base/basictypes.h"
+#include "webrtc/rtc_base/basictypes.h"
namespace webrtc {
diff --git a/webrtc/call/rtcp_demuxer.cc b/webrtc/call/rtcp_demuxer.cc
index 6054fc0..a8003f8 100644
--- a/webrtc/call/rtcp_demuxer.cc
+++ b/webrtc/call/rtcp_demuxer.cc
@@ -10,10 +10,10 @@
#include "webrtc/call/rtcp_demuxer.h"
-#include "webrtc/base/checks.h"
#include "webrtc/call/rtcp_packet_sink_interface.h"
#include "webrtc/call/rtp_rtcp_demuxer_helper.h"
#include "webrtc/common_types.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
diff --git a/webrtc/call/rtcp_demuxer.h b/webrtc/call/rtcp_demuxer.h
index c5c1621..591e011 100644
--- a/webrtc/call/rtcp_demuxer.h
+++ b/webrtc/call/rtcp_demuxer.h
@@ -15,9 +15,9 @@
#include <string>
#include <vector>
-#include "webrtc/base/array_view.h"
-#include "webrtc/base/basictypes.h"
#include "webrtc/call/rsid_resolution_observer.h"
+#include "webrtc/rtc_base/array_view.h"
+#include "webrtc/rtc_base/basictypes.h"
namespace webrtc {
diff --git a/webrtc/call/rtcp_demuxer_unittest.cc b/webrtc/call/rtcp_demuxer_unittest.cc
index 49f037c..89b712b 100644
--- a/webrtc/call/rtcp_demuxer_unittest.cc
+++ b/webrtc/call/rtcp_demuxer_unittest.cc
@@ -12,13 +12,13 @@
#include <memory>
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/ptr_util.h"
#include "webrtc/call/rtcp_packet_sink_interface.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/ptr_util.h"
#include "webrtc/test/gmock.h"
#include "webrtc/test/gtest.h"
diff --git a/webrtc/call/rtcp_packet_sink_interface.h b/webrtc/call/rtcp_packet_sink_interface.h
index e26bd37..1b3cfba 100644
--- a/webrtc/call/rtcp_packet_sink_interface.h
+++ b/webrtc/call/rtcp_packet_sink_interface.h
@@ -10,7 +10,7 @@
#ifndef WEBRTC_CALL_RTCP_PACKET_SINK_INTERFACE_H_
#define WEBRTC_CALL_RTCP_PACKET_SINK_INTERFACE_H_
-#include "webrtc/base/array_view.h"
+#include "webrtc/rtc_base/array_view.h"
namespace webrtc {
diff --git a/webrtc/call/rtp_demuxer.cc b/webrtc/call/rtp_demuxer.cc
index 205498f..ce12342 100644
--- a/webrtc/call/rtp_demuxer.cc
+++ b/webrtc/call/rtp_demuxer.cc
@@ -10,13 +10,13 @@
#include "webrtc/call/rtp_demuxer.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
#include "webrtc/call/rsid_resolution_observer.h"
#include "webrtc/call/rtp_packet_sink_interface.h"
#include "webrtc/call/rtp_rtcp_demuxer_helper.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
namespace webrtc {
diff --git a/webrtc/call/rtp_demuxer_unittest.cc b/webrtc/call/rtp_demuxer_unittest.cc
index 6d61f57..8c2eab1 100644
--- a/webrtc/call/rtp_demuxer_unittest.cc
+++ b/webrtc/call/rtp_demuxer_unittest.cc
@@ -13,16 +13,16 @@
#include <memory>
#include <string>
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/ptr_util.h"
#include "webrtc/call/rsid_resolution_observer.h"
#include "webrtc/call/rtp_packet_sink_interface.h"
#include "webrtc/common_types.h"
#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 "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/ptr_util.h"
#include "webrtc/test/gmock.h"
#include "webrtc/test/gtest.h"
diff --git a/webrtc/call/rtp_rtcp_demuxer_helper.h b/webrtc/call/rtp_rtcp_demuxer_helper.h
index 19bd603..4791e55 100644
--- a/webrtc/call/rtp_rtcp_demuxer_helper.h
+++ b/webrtc/call/rtp_rtcp_demuxer_helper.h
@@ -15,9 +15,9 @@
#include <map>
#include <utility>
-#include "webrtc/base/array_view.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/array_view.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/optional.h"
namespace webrtc {
diff --git a/webrtc/call/rtp_rtcp_demuxer_helper_unittest.cc b/webrtc/call/rtp_rtcp_demuxer_helper_unittest.cc
index e51002f..96a1383 100644
--- a/webrtc/call/rtp_rtcp_demuxer_helper_unittest.cc
+++ b/webrtc/call/rtp_rtcp_demuxer_helper_unittest.cc
@@ -12,9 +12,6 @@
#include "webrtc/call/rtp_rtcp_demuxer_helper.h"
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/buffer.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_jitter_report.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/extended_reports.h"
@@ -22,6 +19,9 @@
#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/sender_report.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/buffer.h"
#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/webrtc/call/rtp_stream_receiver_controller.cc b/webrtc/call/rtp_stream_receiver_controller.cc
index a4b1e36..1238665 100644
--- a/webrtc/call/rtp_stream_receiver_controller.cc
+++ b/webrtc/call/rtp_stream_receiver_controller.cc
@@ -9,7 +9,7 @@
*/
#include "webrtc/call/rtp_stream_receiver_controller.h"
-#include "webrtc/base/ptr_util.h"
+#include "webrtc/rtc_base/ptr_util.h"
namespace webrtc {
diff --git a/webrtc/call/rtp_stream_receiver_controller.h b/webrtc/call/rtp_stream_receiver_controller.h
index 5c8ed67..0fbf669 100644
--- a/webrtc/call/rtp_stream_receiver_controller.h
+++ b/webrtc/call/rtp_stream_receiver_controller.h
@@ -12,9 +12,9 @@
#include <memory>
-#include "webrtc/base/criticalsection.h"
#include "webrtc/call/rtp_demuxer.h"
#include "webrtc/call/rtp_stream_receiver_controller_interface.h"
+#include "webrtc/rtc_base/criticalsection.h"
namespace webrtc {
diff --git a/webrtc/call/rtp_transport_controller_send.h b/webrtc/call/rtp_transport_controller_send.h
index cec8a74..da3ae00 100644
--- a/webrtc/call/rtp_transport_controller_send.h
+++ b/webrtc/call/rtp_transport_controller_send.h
@@ -11,9 +11,9 @@
#ifndef WEBRTC_CALL_RTP_TRANSPORT_CONTROLLER_SEND_H_
#define WEBRTC_CALL_RTP_TRANSPORT_CONTROLLER_SEND_H_
-#include "webrtc/base/constructormagic.h"
#include "webrtc/call/rtp_transport_controller_send_interface.h"
#include "webrtc/modules/congestion_controller/include/send_side_congestion_controller.h"
+#include "webrtc/rtc_base/constructormagic.h"
namespace webrtc {
class Clock;
diff --git a/webrtc/call/syncable.h b/webrtc/call/syncable.h
index 3459f9e..734d20e 100644
--- a/webrtc/call/syncable.h
+++ b/webrtc/call/syncable.h
@@ -16,7 +16,7 @@
#include <stdint.h>
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
namespace webrtc {
diff --git a/webrtc/common_audio/audio_converter.cc b/webrtc/common_audio/audio_converter.cc
index e859533..9e4bdaa 100644
--- a/webrtc/common_audio/audio_converter.cc
+++ b/webrtc/common_audio/audio_converter.cc
@@ -15,10 +15,10 @@
#include <utility>
#include <vector>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/safe_conversions.h"
#include "webrtc/common_audio/channel_buffer.h"
#include "webrtc/common_audio/resampler/push_sinc_resampler.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/safe_conversions.h"
using rtc::checked_cast;
diff --git a/webrtc/common_audio/audio_converter.h b/webrtc/common_audio/audio_converter.h
index d3c65ac..8b2388f 100644
--- a/webrtc/common_audio/audio_converter.h
+++ b/webrtc/common_audio/audio_converter.h
@@ -13,7 +13,7 @@
#include <memory>
-#include "webrtc/base/constructormagic.h"
+#include "webrtc/rtc_base/constructormagic.h"
namespace webrtc {
diff --git a/webrtc/common_audio/audio_converter_unittest.cc b/webrtc/common_audio/audio_converter_unittest.cc
index 320c1da..2c44998 100644
--- a/webrtc/common_audio/audio_converter_unittest.cc
+++ b/webrtc/common_audio/audio_converter_unittest.cc
@@ -13,11 +13,11 @@
#include <memory>
#include <vector>
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/format_macros.h"
#include "webrtc/common_audio/audio_converter.h"
#include "webrtc/common_audio/channel_buffer.h"
#include "webrtc/common_audio/resampler/push_sinc_resampler.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/format_macros.h"
#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/webrtc/common_audio/audio_ring_buffer.cc b/webrtc/common_audio/audio_ring_buffer.cc
index a29e53a..e5631b2 100644
--- a/webrtc/common_audio/audio_ring_buffer.cc
+++ b/webrtc/common_audio/audio_ring_buffer.cc
@@ -10,8 +10,8 @@
#include "webrtc/common_audio/audio_ring_buffer.h"
-#include "webrtc/base/checks.h"
#include "webrtc/common_audio/ring_buffer.h"
+#include "webrtc/rtc_base/checks.h"
// This is a simple multi-channel wrapper over the ring_buffer.h C interface.
diff --git a/webrtc/common_audio/blocker.cc b/webrtc/common_audio/blocker.cc
index 86dfdf3..6969332 100644
--- a/webrtc/common_audio/blocker.cc
+++ b/webrtc/common_audio/blocker.cc
@@ -12,7 +12,7 @@
#include <string.h>
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace {
diff --git a/webrtc/common_audio/blocker_unittest.cc b/webrtc/common_audio/blocker_unittest.cc
index 1c675db..3af9699 100644
--- a/webrtc/common_audio/blocker_unittest.cc
+++ b/webrtc/common_audio/blocker_unittest.cc
@@ -12,7 +12,7 @@
#include "webrtc/common_audio/blocker.h"
-#include "webrtc/base/arraysize.h"
+#include "webrtc/rtc_base/arraysize.h"
#include "webrtc/test/gtest.h"
namespace {
diff --git a/webrtc/common_audio/channel_buffer.cc b/webrtc/common_audio/channel_buffer.cc
index 0f36411..e7912bb 100644
--- a/webrtc/common_audio/channel_buffer.cc
+++ b/webrtc/common_audio/channel_buffer.cc
@@ -10,7 +10,7 @@
#include "webrtc/common_audio/channel_buffer.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
diff --git a/webrtc/common_audio/channel_buffer.h b/webrtc/common_audio/channel_buffer.h
index 930dd73..5d4fb88 100644
--- a/webrtc/common_audio/channel_buffer.h
+++ b/webrtc/common_audio/channel_buffer.h
@@ -15,9 +15,9 @@
#include <memory>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/gtest_prod_util.h"
#include "webrtc/common_audio/include/audio_util.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/gtest_prod_util.h"
namespace webrtc {
diff --git a/webrtc/common_audio/fir_filter.cc b/webrtc/common_audio/fir_filter.cc
index 5f5e210..f069af3 100644
--- a/webrtc/common_audio/fir_filter.cc
+++ b/webrtc/common_audio/fir_filter.cc
@@ -14,9 +14,9 @@
#include <memory>
-#include "webrtc/base/checks.h"
#include "webrtc/common_audio/fir_filter_neon.h"
#include "webrtc/common_audio/fir_filter_sse.h"
+#include "webrtc/rtc_base/checks.h"
#include "webrtc/system_wrappers/include/cpu_features_wrapper.h"
namespace webrtc {
diff --git a/webrtc/common_audio/fir_filter_neon.cc b/webrtc/common_audio/fir_filter_neon.cc
index 54e58d0..26d1195 100644
--- a/webrtc/common_audio/fir_filter_neon.cc
+++ b/webrtc/common_audio/fir_filter_neon.cc
@@ -13,7 +13,7 @@
#include <arm_neon.h>
#include <string.h>
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
#include "webrtc/system_wrappers/include/aligned_malloc.h"
namespace webrtc {
diff --git a/webrtc/common_audio/fir_filter_sse.cc b/webrtc/common_audio/fir_filter_sse.cc
index 308eeb6..3e7c2af 100644
--- a/webrtc/common_audio/fir_filter_sse.cc
+++ b/webrtc/common_audio/fir_filter_sse.cc
@@ -14,7 +14,7 @@
#include <string.h>
#include <xmmintrin.h>
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
#include "webrtc/system_wrappers/include/aligned_malloc.h"
namespace webrtc {
diff --git a/webrtc/common_audio/include/audio_util.h b/webrtc/common_audio/include/audio_util.h
index 9307c55..f1077c6 100644
--- a/webrtc/common_audio/include/audio_util.h
+++ b/webrtc/common_audio/include/audio_util.h
@@ -15,7 +15,7 @@
#include <limits>
#include <cstring>
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/webrtc/common_audio/lapped_transform.cc b/webrtc/common_audio/lapped_transform.cc
index 6825beb..227b866 100644
--- a/webrtc/common_audio/lapped_transform.cc
+++ b/webrtc/common_audio/lapped_transform.cc
@@ -14,8 +14,8 @@
#include <cstdlib>
#include <cstring>
-#include "webrtc/base/checks.h"
#include "webrtc/common_audio/real_fourier.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
diff --git a/webrtc/common_audio/real_fourier.cc b/webrtc/common_audio/real_fourier.cc
index e721346..ed1ad11 100644
--- a/webrtc/common_audio/real_fourier.cc
+++ b/webrtc/common_audio/real_fourier.cc
@@ -10,10 +10,10 @@
#include "webrtc/common_audio/real_fourier.h"
-#include "webrtc/base/checks.h"
#include "webrtc/common_audio/real_fourier_ooura.h"
#include "webrtc/common_audio/real_fourier_openmax.h"
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
diff --git a/webrtc/common_audio/real_fourier_ooura.cc b/webrtc/common_audio/real_fourier_ooura.cc
index 8cd4c86..26a8a7d 100644
--- a/webrtc/common_audio/real_fourier_ooura.cc
+++ b/webrtc/common_audio/real_fourier_ooura.cc
@@ -13,8 +13,8 @@
#include <cmath>
#include <algorithm>
-#include "webrtc/base/checks.h"
#include "webrtc/common_audio/fft4g.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
diff --git a/webrtc/common_audio/real_fourier_openmax.cc b/webrtc/common_audio/real_fourier_openmax.cc
index bc3e734..4d971da 100644
--- a/webrtc/common_audio/real_fourier_openmax.cc
+++ b/webrtc/common_audio/real_fourier_openmax.cc
@@ -13,7 +13,7 @@
#include <cstdlib>
#include "dl/sp/api/omxSP.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
diff --git a/webrtc/common_audio/resampler/push_resampler.cc b/webrtc/common_audio/resampler/push_resampler.cc
index ec904b8..38cdf2b 100644
--- a/webrtc/common_audio/resampler/push_resampler.cc
+++ b/webrtc/common_audio/resampler/push_resampler.cc
@@ -12,10 +12,10 @@
#include <string.h>
-#include "webrtc/base/checks.h"
#include "webrtc/common_audio/include/audio_util.h"
#include "webrtc/common_audio/resampler/include/resampler.h"
#include "webrtc/common_audio/resampler/push_sinc_resampler.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
namespace {
diff --git a/webrtc/common_audio/resampler/push_resampler_unittest.cc b/webrtc/common_audio/resampler/push_resampler_unittest.cc
index 9a5cb5d..eb08f70 100644
--- a/webrtc/common_audio/resampler/push_resampler_unittest.cc
+++ b/webrtc/common_audio/resampler/push_resampler_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/base/checks.h" // RTC_DCHECK_IS_ON
#include "webrtc/common_audio/resampler/include/push_resampler.h"
+#include "webrtc/rtc_base/checks.h" // RTC_DCHECK_IS_ON
#include "webrtc/test/gtest.h"
// Quality testing of PushResampler is handled through output_mixer_unittest.cc.
diff --git a/webrtc/common_audio/resampler/push_sinc_resampler.cc b/webrtc/common_audio/resampler/push_sinc_resampler.cc
index a740423..3b603db 100644
--- a/webrtc/common_audio/resampler/push_sinc_resampler.cc
+++ b/webrtc/common_audio/resampler/push_sinc_resampler.cc
@@ -12,8 +12,8 @@
#include <cstring>
-#include "webrtc/base/checks.h"
#include "webrtc/common_audio/include/audio_util.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
diff --git a/webrtc/common_audio/resampler/push_sinc_resampler.h b/webrtc/common_audio/resampler/push_sinc_resampler.h
index 2ba60ca..7af85c8 100644
--- a/webrtc/common_audio/resampler/push_sinc_resampler.h
+++ b/webrtc/common_audio/resampler/push_sinc_resampler.h
@@ -13,8 +13,8 @@
#include <memory>
-#include "webrtc/base/constructormagic.h"
#include "webrtc/common_audio/resampler/sinc_resampler.h"
+#include "webrtc/rtc_base/constructormagic.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc b/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc
index eab46ef..cb156cc 100644
--- a/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc
+++ b/webrtc/common_audio/resampler/push_sinc_resampler_unittest.cc
@@ -13,10 +13,10 @@
#include <cstring>
#include <memory>
-#include "webrtc/base/timeutils.h"
#include "webrtc/common_audio/include/audio_util.h"
#include "webrtc/common_audio/resampler/push_sinc_resampler.h"
#include "webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h"
+#include "webrtc/rtc_base/timeutils.h"
#include "webrtc/test/gmock.h"
#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
diff --git a/webrtc/common_audio/resampler/sinc_resampler.cc b/webrtc/common_audio/resampler/sinc_resampler.cc
index 1203f77..acf7d0f 100644
--- a/webrtc/common_audio/resampler/sinc_resampler.cc
+++ b/webrtc/common_audio/resampler/sinc_resampler.cc
@@ -92,7 +92,7 @@
#include <limits>
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
#include "webrtc/system_wrappers/include/cpu_features_wrapper.h"
#include "webrtc/typedefs.h"
diff --git a/webrtc/common_audio/resampler/sinc_resampler.h b/webrtc/common_audio/resampler/sinc_resampler.h
index ecfd64c..fa92163 100644
--- a/webrtc/common_audio/resampler/sinc_resampler.h
+++ b/webrtc/common_audio/resampler/sinc_resampler.h
@@ -16,8 +16,8 @@
#include <memory>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/gtest_prod_util.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/gtest_prod_util.h"
#include "webrtc/system_wrappers/include/aligned_malloc.h"
#include "webrtc/typedefs.h"
diff --git a/webrtc/common_audio/resampler/sinc_resampler_unittest.cc b/webrtc/common_audio/resampler/sinc_resampler_unittest.cc
index 990580d..8a3d1ec 100644
--- a/webrtc/common_audio/resampler/sinc_resampler_unittest.cc
+++ b/webrtc/common_audio/resampler/sinc_resampler_unittest.cc
@@ -19,10 +19,10 @@
#include <algorithm>
#include <memory>
-#include "webrtc/base/stringize_macros.h"
-#include "webrtc/base/timeutils.h"
#include "webrtc/common_audio/resampler/sinc_resampler.h"
#include "webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h"
+#include "webrtc/rtc_base/stringize_macros.h"
+#include "webrtc/rtc_base/timeutils.h"
#include "webrtc/system_wrappers/include/cpu_features_wrapper.h"
#include "webrtc/test/gmock.h"
#include "webrtc/test/gtest.h"
diff --git a/webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h b/webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h
index 1807f86..80ccd80 100644
--- a/webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h
+++ b/webrtc/common_audio/resampler/sinusoidal_linear_chirp_source.h
@@ -14,8 +14,8 @@
#ifndef WEBRTC_COMMON_AUDIO_RESAMPLER_SINUSOIDAL_LINEAR_CHIRP_SOURCE_H_
#define WEBRTC_COMMON_AUDIO_RESAMPLER_SINUSOIDAL_LINEAR_CHIRP_SOURCE_H_
-#include "webrtc/base/constructormagic.h"
#include "webrtc/common_audio/resampler/sinc_resampler.h"
+#include "webrtc/rtc_base/constructormagic.h"
namespace webrtc {
diff --git a/webrtc/common_audio/signal_processing/dot_product_with_scale.cc b/webrtc/common_audio/signal_processing/dot_product_with_scale.cc
index 4067ab5..7cd6e91 100644
--- a/webrtc/common_audio/signal_processing/dot_product_with_scale.cc
+++ b/webrtc/common_audio/signal_processing/dot_product_with_scale.cc
@@ -10,7 +10,7 @@
#include "webrtc/common_audio/signal_processing/dot_product_with_scale.h"
-#include "webrtc/base/safe_conversions.h"
+#include "webrtc/rtc_base/safe_conversions.h"
int32_t WebRtcSpl_DotProductWithScale(const int16_t* vector1,
const int16_t* vector2,
diff --git a/webrtc/common_audio/signal_processing/include/spl_inl.h b/webrtc/common_audio/signal_processing/include/spl_inl.h
index 2eb958f..c5aec27 100644
--- a/webrtc/common_audio/signal_processing/include/spl_inl.h
+++ b/webrtc/common_audio/signal_processing/include/spl_inl.h
@@ -15,7 +15,7 @@
#ifndef WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_H_
#define WEBRTC_COMMON_AUDIO_SIGNAL_PROCESSING_INCLUDE_SPL_INL_H_
-#include "webrtc/base/compile_assert_c.h"
+#include "webrtc/rtc_base/compile_assert_c.h"
extern const int8_t kWebRtcSpl_CountLeadingZeros32_Table[64];
diff --git a/webrtc/common_audio/smoothing_filter.cc b/webrtc/common_audio/smoothing_filter.cc
index 91bcb22..d95662c 100644
--- a/webrtc/common_audio/smoothing_filter.cc
+++ b/webrtc/common_audio/smoothing_filter.cc
@@ -12,7 +12,7 @@
#include <cmath>
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/timeutils.h"
namespace webrtc {
diff --git a/webrtc/common_audio/smoothing_filter.h b/webrtc/common_audio/smoothing_filter.h
index 39bc56a..c59842e 100644
--- a/webrtc/common_audio/smoothing_filter.h
+++ b/webrtc/common_audio/smoothing_filter.h
@@ -11,8 +11,8 @@
#ifndef WEBRTC_COMMON_AUDIO_SMOOTHING_FILTER_H_
#define WEBRTC_COMMON_AUDIO_SMOOTHING_FILTER_H_
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/optional.h"
#include "webrtc/system_wrappers/include/clock.h"
namespace webrtc {
diff --git a/webrtc/common_audio/smoothing_filter_unittest.cc b/webrtc/common_audio/smoothing_filter_unittest.cc
index 5075545..6e0bde8 100644
--- a/webrtc/common_audio/smoothing_filter_unittest.cc
+++ b/webrtc/common_audio/smoothing_filter_unittest.cc
@@ -11,8 +11,8 @@
#include <cmath>
#include <memory>
-#include "webrtc/base/fakeclock.h"
#include "webrtc/common_audio/smoothing_filter.h"
+#include "webrtc/rtc_base/fakeclock.h"
#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/webrtc/common_audio/sparse_fir_filter.cc b/webrtc/common_audio/sparse_fir_filter.cc
index 2928004..299028f 100644
--- a/webrtc/common_audio/sparse_fir_filter.cc
+++ b/webrtc/common_audio/sparse_fir_filter.cc
@@ -10,7 +10,7 @@
#include "webrtc/common_audio/sparse_fir_filter.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
diff --git a/webrtc/common_audio/sparse_fir_filter.h b/webrtc/common_audio/sparse_fir_filter.h
index 2d406a0..6bc5528 100644
--- a/webrtc/common_audio/sparse_fir_filter.h
+++ b/webrtc/common_audio/sparse_fir_filter.h
@@ -14,7 +14,7 @@
#include <cstring>
#include <vector>
-#include "webrtc/base/constructormagic.h"
+#include "webrtc/rtc_base/constructormagic.h"
namespace webrtc {
diff --git a/webrtc/common_audio/sparse_fir_filter_unittest.cc b/webrtc/common_audio/sparse_fir_filter_unittest.cc
index e7ba5d2..a000596 100644
--- a/webrtc/common_audio/sparse_fir_filter_unittest.cc
+++ b/webrtc/common_audio/sparse_fir_filter_unittest.cc
@@ -12,8 +12,8 @@
#include "webrtc/common_audio/sparse_fir_filter.h"
-#include "webrtc/base/arraysize.h"
#include "webrtc/common_audio/fir_filter.h"
+#include "webrtc/rtc_base/arraysize.h"
#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/webrtc/common_audio/vad/include/vad.h b/webrtc/common_audio/vad/include/vad.h
index 86e6f66..ed649f5 100644
--- a/webrtc/common_audio/vad/include/vad.h
+++ b/webrtc/common_audio/vad/include/vad.h
@@ -13,8 +13,8 @@
#include <memory>
-#include "webrtc/base/checks.h"
#include "webrtc/common_audio/vad/include/webrtc_vad.h"
+#include "webrtc/rtc_base/checks.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/webrtc/common_audio/vad/vad.cc b/webrtc/common_audio/vad/vad.cc
index e634aa2..5f3443e 100644
--- a/webrtc/common_audio/vad/vad.cc
+++ b/webrtc/common_audio/vad/vad.cc
@@ -12,7 +12,7 @@
#include <memory>
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
diff --git a/webrtc/common_audio/vad/vad_unittest.cc b/webrtc/common_audio/vad/vad_unittest.cc
index f2210d9..69d6a7b 100644
--- a/webrtc/common_audio/vad/vad_unittest.cc
+++ b/webrtc/common_audio/vad/vad_unittest.cc
@@ -12,10 +12,10 @@
#include <stdlib.h>
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/checks.h"
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
#include "webrtc/common_audio/vad/include/webrtc_vad.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/checks.h"
#include "webrtc/test/gtest.h"
#include "webrtc/typedefs.h"
diff --git a/webrtc/common_audio/wav_file.cc b/webrtc/common_audio/wav_file.cc
index 0f37f9c..3b1b9ee 100644
--- a/webrtc/common_audio/wav_file.cc
+++ b/webrtc/common_audio/wav_file.cc
@@ -15,10 +15,10 @@
#include <limits>
#include <sstream>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/safe_conversions.h"
#include "webrtc/common_audio/include/audio_util.h"
#include "webrtc/common_audio/wav_header.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/safe_conversions.h"
namespace webrtc {
diff --git a/webrtc/common_audio/wav_file.h b/webrtc/common_audio/wav_file.h
index 812c21d..1ec6c65 100644
--- a/webrtc/common_audio/wav_file.h
+++ b/webrtc/common_audio/wav_file.h
@@ -17,7 +17,7 @@
#include <cstddef>
#include <string>
-#include "webrtc/base/constructormagic.h"
+#include "webrtc/rtc_base/constructormagic.h"
namespace webrtc {
diff --git a/webrtc/common_audio/wav_header.cc b/webrtc/common_audio/wav_header.cc
index 402ea17..0423c08 100644
--- a/webrtc/common_audio/wav_header.cc
+++ b/webrtc/common_audio/wav_header.cc
@@ -19,8 +19,8 @@
#include <limits>
#include <string>
-#include "webrtc/base/checks.h"
#include "webrtc/common_audio/include/audio_util.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
namespace {
diff --git a/webrtc/common_audio/window_generator.cc b/webrtc/common_audio/window_generator.cc
index ab983b7..ea5198a 100644
--- a/webrtc/common_audio/window_generator.cc
+++ b/webrtc/common_audio/window_generator.cc
@@ -15,7 +15,7 @@
#include <cmath>
#include <complex>
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
using std::complex;
diff --git a/webrtc/common_audio/window_generator.h b/webrtc/common_audio/window_generator.h
index 25dd233..3bbf21a 100644
--- a/webrtc/common_audio/window_generator.h
+++ b/webrtc/common_audio/window_generator.h
@@ -13,7 +13,7 @@
#include <stddef.h>
-#include "webrtc/base/constructormagic.h"
+#include "webrtc/rtc_base/constructormagic.h"
namespace webrtc {
diff --git a/webrtc/common_types.cc b/webrtc/common_types.cc
index 70e5d2e..a76175f 100644
--- a/webrtc/common_types.cc
+++ b/webrtc/common_types.cc
@@ -15,8 +15,8 @@
#include <limits>
#include <type_traits>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/stringutils.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/stringutils.h"
namespace webrtc {
diff --git a/webrtc/common_types.h b/webrtc/common_types.h
index 7b62dbc..5215d31 100644
--- a/webrtc/common_types.h
+++ b/webrtc/common_types.h
@@ -21,9 +21,9 @@
#include "webrtc/api/video/video_content_type.h"
#include "webrtc/api/video/video_rotation.h"
#include "webrtc/api/video/video_timing.h"
-#include "webrtc/base/array_view.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/array_view.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/optional.h"
#include "webrtc/typedefs.h"
#if defined(_MSC_VER)
diff --git a/webrtc/common_video/bitrate_adjuster.cc b/webrtc/common_video/bitrate_adjuster.cc
index 9c5c077..7f58ec9 100644
--- a/webrtc/common_video/bitrate_adjuster.cc
+++ b/webrtc/common_video/bitrate_adjuster.cc
@@ -13,8 +13,8 @@
#include <algorithm>
#include <cmath>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/system_wrappers/include/clock.h"
namespace webrtc {
diff --git a/webrtc/common_video/h264/h264_bitstream_parser.cc b/webrtc/common_video/h264/h264_bitstream_parser.cc
index 8bc4747..4661687 100644
--- a/webrtc/common_video/h264/h264_bitstream_parser.cc
+++ b/webrtc/common_video/h264/h264_bitstream_parser.cc
@@ -12,11 +12,11 @@
#include <memory>
#include <vector>
-#include "webrtc/base/bitbuffer.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/bitbuffer.h"
+#include "webrtc/rtc_base/checks.h"
#include "webrtc/common_video/h264/h264_common.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
namespace {
const int kMaxAbsQpDeltaValue = 51;
diff --git a/webrtc/common_video/h264/h264_bitstream_parser.h b/webrtc/common_video/h264/h264_bitstream_parser.h
index aa01552..136c903 100644
--- a/webrtc/common_video/h264/h264_bitstream_parser.h
+++ b/webrtc/common_video/h264/h264_bitstream_parser.h
@@ -13,9 +13,9 @@
#include <stddef.h>
#include <stdint.h>
-#include "webrtc/base/optional.h"
#include "webrtc/common_video/h264/pps_parser.h"
#include "webrtc/common_video/h264/sps_parser.h"
+#include "webrtc/rtc_base/optional.h"
namespace rtc {
class BitBufferWriter;
diff --git a/webrtc/common_video/h264/h264_common.h b/webrtc/common_video/h264/h264_common.h
index c63875f..fc34484 100644
--- a/webrtc/common_video/h264/h264_common.h
+++ b/webrtc/common_video/h264/h264_common.h
@@ -14,7 +14,7 @@
#include <memory>
#include <vector>
-#include "webrtc/base/buffer.h"
+#include "webrtc/rtc_base/buffer.h"
namespace webrtc {
diff --git a/webrtc/common_video/h264/pps_parser.cc b/webrtc/common_video/h264/pps_parser.cc
index 228d853..0df0289 100644
--- a/webrtc/common_video/h264/pps_parser.cc
+++ b/webrtc/common_video/h264/pps_parser.cc
@@ -14,8 +14,8 @@
#include <vector>
#include "webrtc/common_video/h264/h264_common.h"
-#include "webrtc/base/bitbuffer.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/bitbuffer.h"
+#include "webrtc/rtc_base/logging.h"
#define RETURN_EMPTY_ON_FAIL(x) \
if (!(x)) { \
diff --git a/webrtc/common_video/h264/pps_parser.h b/webrtc/common_video/h264/pps_parser.h
index 02167a8..941b99e 100644
--- a/webrtc/common_video/h264/pps_parser.h
+++ b/webrtc/common_video/h264/pps_parser.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_COMMON_VIDEO_H264_PPS_PARSER_H_
#define WEBRTC_COMMON_VIDEO_H264_PPS_PARSER_H_
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
namespace rtc {
class BitBuffer;
diff --git a/webrtc/common_video/h264/pps_parser_unittest.cc b/webrtc/common_video/h264/pps_parser_unittest.cc
index 0349064..886808a 100644
--- a/webrtc/common_video/h264/pps_parser_unittest.cc
+++ b/webrtc/common_video/h264/pps_parser_unittest.cc
@@ -13,9 +13,9 @@
#include <limits>
#include <memory>
-#include "webrtc/base/bitbuffer.h"
-#include "webrtc/base/buffer.h"
#include "webrtc/common_video/h264/h264_common.h"
+#include "webrtc/rtc_base/bitbuffer.h"
+#include "webrtc/rtc_base/buffer.h"
#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/webrtc/common_video/h264/sps_parser.cc b/webrtc/common_video/h264/sps_parser.cc
index 3bf0853..fbf7ee7 100644
--- a/webrtc/common_video/h264/sps_parser.cc
+++ b/webrtc/common_video/h264/sps_parser.cc
@@ -14,8 +14,8 @@
#include <vector>
#include "webrtc/common_video/h264/h264_common.h"
-#include "webrtc/base/bitbuffer.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/bitbuffer.h"
+#include "webrtc/rtc_base/logging.h"
typedef rtc::Optional<webrtc::SpsParser::SpsState> OptionalSps;
diff --git a/webrtc/common_video/h264/sps_parser.h b/webrtc/common_video/h264/sps_parser.h
index dfd4b6b..ea14f79 100644
--- a/webrtc/common_video/h264/sps_parser.h
+++ b/webrtc/common_video/h264/sps_parser.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_COMMON_VIDEO_H264_SPS_PARSER_H_
#define WEBRTC_COMMON_VIDEO_H264_SPS_PARSER_H_
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
namespace rtc {
class BitBuffer;
diff --git a/webrtc/common_video/h264/sps_parser_unittest.cc b/webrtc/common_video/h264/sps_parser_unittest.cc
index 958ddc0..5a0df9a 100644
--- a/webrtc/common_video/h264/sps_parser_unittest.cc
+++ b/webrtc/common_video/h264/sps_parser_unittest.cc
@@ -10,10 +10,10 @@
#include "webrtc/common_video/h264/sps_parser.h"
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/bitbuffer.h"
-#include "webrtc/base/buffer.h"
#include "webrtc/common_video/h264/h264_common.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/bitbuffer.h"
+#include "webrtc/rtc_base/buffer.h"
#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/webrtc/common_video/h264/sps_vui_rewriter.cc b/webrtc/common_video/h264/sps_vui_rewriter.cc
index 534e75c..1d1b76e 100644
--- a/webrtc/common_video/h264/sps_vui_rewriter.cc
+++ b/webrtc/common_video/h264/sps_vui_rewriter.cc
@@ -15,10 +15,10 @@
#include <memory>
#include <vector>
-#include "webrtc/base/bitbuffer.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/safe_minmax.h"
+#include "webrtc/rtc_base/bitbuffer.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/safe_minmax.h"
#include "webrtc/common_video/h264/h264_common.h"
#include "webrtc/common_video/h264/sps_parser.h"
diff --git a/webrtc/common_video/h264/sps_vui_rewriter.h b/webrtc/common_video/h264/sps_vui_rewriter.h
index bf052b3..6eff1ab 100644
--- a/webrtc/common_video/h264/sps_vui_rewriter.h
+++ b/webrtc/common_video/h264/sps_vui_rewriter.h
@@ -12,9 +12,9 @@
#ifndef WEBRTC_COMMON_VIDEO_H264_SPS_VUI_REWRITER_H_
#define WEBRTC_COMMON_VIDEO_H264_SPS_VUI_REWRITER_H_
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/optional.h"
#include "webrtc/common_video/h264/sps_parser.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/optional.h"
namespace rtc {
class BitBuffer;
diff --git a/webrtc/common_video/h264/sps_vui_rewriter_unittest.cc b/webrtc/common_video/h264/sps_vui_rewriter_unittest.cc
index 44c6287..4f36e58 100644
--- a/webrtc/common_video/h264/sps_vui_rewriter_unittest.cc
+++ b/webrtc/common_video/h264/sps_vui_rewriter_unittest.cc
@@ -10,13 +10,13 @@
#include <vector>
-#include "webrtc/base/bitbuffer.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/fileutils.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/pathutils.h"
#include "webrtc/common_video/h264/h264_common.h"
#include "webrtc/common_video/h264/sps_vui_rewriter.h"
+#include "webrtc/rtc_base/bitbuffer.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/fileutils.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/pathutils.h"
#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/webrtc/common_video/i420_buffer_pool.cc b/webrtc/common_video/i420_buffer_pool.cc
index aa9c32e..8dab614 100644
--- a/webrtc/common_video/i420_buffer_pool.cc
+++ b/webrtc/common_video/i420_buffer_pool.cc
@@ -10,7 +10,7 @@
#include "webrtc/common_video/include/i420_buffer_pool.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
diff --git a/webrtc/common_video/i420_video_frame_unittest.cc b/webrtc/common_video/i420_video_frame_unittest.cc
index 0b564ff2..025c54b 100644
--- a/webrtc/common_video/i420_video_frame_unittest.cc
+++ b/webrtc/common_video/i420_video_frame_unittest.cc
@@ -11,10 +11,10 @@
#include <math.h>
#include <string.h>
-#include "webrtc/api/video/video_frame.h"
#include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/api/video/video_frame.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/timeutils.h"
#include "webrtc/test/fake_texture_frame.h"
#include "webrtc/test/frame_utils.h"
#include "webrtc/test/gtest.h"
diff --git a/webrtc/common_video/include/bitrate_adjuster.h b/webrtc/common_video/include/bitrate_adjuster.h
index 5fd1e38..1b70ebd 100644
--- a/webrtc/common_video/include/bitrate_adjuster.h
+++ b/webrtc/common_video/include/bitrate_adjuster.h
@@ -13,8 +13,8 @@
#include <functional>
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/rate_statistics.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/rate_statistics.h"
namespace webrtc {
diff --git a/webrtc/common_video/include/i420_buffer_pool.h b/webrtc/common_video/include/i420_buffer_pool.h
index 454a8cd..85206ee 100644
--- a/webrtc/common_video/include/i420_buffer_pool.h
+++ b/webrtc/common_video/include/i420_buffer_pool.h
@@ -15,7 +15,7 @@
#include <limits>
#include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/base/race_checker.h"
+#include "webrtc/rtc_base/race_checker.h"
namespace webrtc {
diff --git a/webrtc/common_video/include/incoming_video_stream.h b/webrtc/common_video/include/incoming_video_stream.h
index ff407c5..927336a 100644
--- a/webrtc/common_video/include/incoming_video_stream.h
+++ b/webrtc/common_video/include/incoming_video_stream.h
@@ -11,10 +11,10 @@
#ifndef WEBRTC_COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_
#define WEBRTC_COMMON_VIDEO_INCLUDE_INCOMING_VIDEO_STREAM_H_
-#include "webrtc/base/race_checker.h"
-#include "webrtc/base/task_queue.h"
#include "webrtc/common_video/video_render_frames.h"
#include "webrtc/media/base/videosinkinterface.h"
+#include "webrtc/rtc_base/race_checker.h"
+#include "webrtc/rtc_base/task_queue.h"
namespace webrtc {
diff --git a/webrtc/common_video/include/video_frame_buffer.h b/webrtc/common_video/include/video_frame_buffer.h
index 8016c65..cdeb7cd 100644
--- a/webrtc/common_video/include/video_frame_buffer.h
+++ b/webrtc/common_video/include/video_frame_buffer.h
@@ -14,8 +14,8 @@
#include <memory>
#include "webrtc/api/video/video_frame_buffer.h"
-#include "webrtc/base/callback.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/callback.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
namespace webrtc {
diff --git a/webrtc/common_video/incoming_video_stream.cc b/webrtc/common_video/incoming_video_stream.cc
index 8f5d474..be16cfb 100644
--- a/webrtc/common_video/incoming_video_stream.cc
+++ b/webrtc/common_video/incoming_video_stream.cc
@@ -12,9 +12,9 @@
#include <memory>
-#include "webrtc/base/timeutils.h"
-#include "webrtc/base/trace_event.h"
#include "webrtc/common_video/video_render_frames.h"
+#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/rtc_base/trace_event.h"
#include "webrtc/system_wrappers/include/event_wrapper.h"
namespace webrtc {
diff --git a/webrtc/common_video/libyuv/webrtc_libyuv.cc b/webrtc/common_video/libyuv/webrtc_libyuv.cc
index 0b3957a..0cb3b04 100644
--- a/webrtc/common_video/libyuv/webrtc_libyuv.cc
+++ b/webrtc/common_video/libyuv/webrtc_libyuv.cc
@@ -12,7 +12,7 @@
#include <string.h>
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
// TODO(nisse): Only needed for the deprecated ConvertToI420.
#include "webrtc/api/video/i420_buffer.h"
diff --git a/webrtc/common_video/video_frame.cc b/webrtc/common_video/video_frame.cc
index f062b73..862905f 100644
--- a/webrtc/common_video/video_frame.cc
+++ b/webrtc/common_video/video_frame.cc
@@ -14,8 +14,8 @@
#include <algorithm> // swap
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
diff --git a/webrtc/common_video/video_frame_buffer.cc b/webrtc/common_video/video_frame_buffer.cc
index 3c4d2a0..f26e627 100644
--- a/webrtc/common_video/video_frame_buffer.cc
+++ b/webrtc/common_video/video_frame_buffer.cc
@@ -13,11 +13,11 @@
#include <algorithm>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/keep_ref_until_done.h"
#include "libyuv/convert.h"
#include "libyuv/planar_functions.h"
#include "libyuv/scale.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/keep_ref_until_done.h"
namespace webrtc {
diff --git a/webrtc/common_video/video_render_frames.cc b/webrtc/common_video/video_render_frames.cc
index 31415c5..2cb8d0c 100644
--- a/webrtc/common_video/video_render_frames.cc
+++ b/webrtc/common_video/video_render_frames.cc
@@ -12,9 +12,9 @@
#include <utility>
-#include "webrtc/base/logging.h"
-#include "webrtc/base/timeutils.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/timeutils.h"
#include "webrtc/system_wrappers/include/trace.h"
namespace webrtc {
diff --git a/webrtc/common_video/video_render_frames.h b/webrtc/common_video/video_render_frames.h
index 5ed0760..4f043e1 100644
--- a/webrtc/common_video/video_render_frames.h
+++ b/webrtc/common_video/video_render_frames.h
@@ -16,7 +16,7 @@
#include <list>
#include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
namespace webrtc {
diff --git a/webrtc/examples/peerconnection/client/conductor.cc b/webrtc/examples/peerconnection/client/conductor.cc
index 7c41027..8a1b9a2 100644
--- a/webrtc/examples/peerconnection/client/conductor.cc
+++ b/webrtc/examples/peerconnection/client/conductor.cc
@@ -15,12 +15,12 @@
#include <vector>
#include "webrtc/api/test/fakeconstraints.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/json.h"
-#include "webrtc/base/logging.h"
#include "webrtc/examples/peerconnection/client/defaults.h"
#include "webrtc/media/engine/webrtcvideocapturerfactory.h"
#include "webrtc/modules/video_capture/video_capture_factory.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/json.h"
+#include "webrtc/rtc_base/logging.h"
// Names used for a IceCandidate JSON object.
const char kCandidateSdpMidName[] = "sdpMid";
diff --git a/webrtc/examples/peerconnection/client/defaults.cc b/webrtc/examples/peerconnection/client/defaults.cc
index 5a20242..ed8cdb1 100644
--- a/webrtc/examples/peerconnection/client/defaults.cc
+++ b/webrtc/examples/peerconnection/client/defaults.cc
@@ -19,7 +19,7 @@
#include <unistd.h>
#endif
-#include "webrtc/base/arraysize.h"
+#include "webrtc/rtc_base/arraysize.h"
const char kAudioLabel[] = "audio_label";
const char kVideoLabel[] = "video_label";
diff --git a/webrtc/examples/peerconnection/client/flagdefs.h b/webrtc/examples/peerconnection/client/flagdefs.h
index 19a2b02..f3dda76 100644
--- a/webrtc/examples/peerconnection/client/flagdefs.h
+++ b/webrtc/examples/peerconnection/client/flagdefs.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_
#define WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_FLAGDEFS_H_
-#include "webrtc/base/flags.h"
+#include "webrtc/rtc_base/flags.h"
extern const uint16_t kDefaultServerPort; // From defaults.[h|cc]
diff --git a/webrtc/examples/peerconnection/client/linux/main.cc b/webrtc/examples/peerconnection/client/linux/main.cc
index 7886f76..d57bc98 100644
--- a/webrtc/examples/peerconnection/client/linux/main.cc
+++ b/webrtc/examples/peerconnection/client/linux/main.cc
@@ -15,8 +15,8 @@
#include "webrtc/examples/peerconnection/client/linux/main_wnd.h"
#include "webrtc/examples/peerconnection/client/peer_connection_client.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/thread.h"
class CustomSocketServer : public rtc::PhysicalSocketServer {
public:
diff --git a/webrtc/examples/peerconnection/client/linux/main_wnd.cc b/webrtc/examples/peerconnection/client/linux/main_wnd.cc
index 151faaa..d9f32bc 100644
--- a/webrtc/examples/peerconnection/client/linux/main_wnd.cc
+++ b/webrtc/examples/peerconnection/client/linux/main_wnd.cc
@@ -17,9 +17,9 @@
#include "libyuv/convert_from.h"
#include "webrtc/api/video/i420_buffer.h"
#include "webrtc/examples/peerconnection/client/defaults.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/stringutils.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/stringutils.h"
using rtc::sprintfn;
diff --git a/webrtc/examples/peerconnection/client/main.cc b/webrtc/examples/peerconnection/client/main.cc
index 5ec1a7a..bd69be9 100644
--- a/webrtc/examples/peerconnection/client/main.cc
+++ b/webrtc/examples/peerconnection/client/main.cc
@@ -12,11 +12,10 @@
#include "webrtc/examples/peerconnection/client/flagdefs.h"
#include "webrtc/examples/peerconnection/client/main_wnd.h"
#include "webrtc/examples/peerconnection/client/peer_connection_client.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/win32socketinit.h"
-#include "webrtc/base/win32socketserver.h"
-
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/win32socketinit.h"
+#include "webrtc/rtc_base/win32socketserver.h"
int PASCAL wWinMain(HINSTANCE instance, HINSTANCE prev_instance,
wchar_t* cmd_line, int cmd_show) {
diff --git a/webrtc/examples/peerconnection/client/main_wnd.cc b/webrtc/examples/peerconnection/client/main_wnd.cc
index e7c4c6e..da21c5f 100644
--- a/webrtc/examples/peerconnection/client/main_wnd.cc
+++ b/webrtc/examples/peerconnection/client/main_wnd.cc
@@ -15,9 +15,9 @@
#include "libyuv/convert_argb.h"
#include "webrtc/api/video/i420_buffer.h"
#include "webrtc/examples/peerconnection/client/defaults.h"
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
ATOM MainWnd::wnd_class_ = 0;
const wchar_t MainWnd::kClassName[] = L"WebRTC_MainWnd";
diff --git a/webrtc/examples/peerconnection/client/main_wnd.h b/webrtc/examples/peerconnection/client/main_wnd.h
index 01c8823..18f56a7 100644
--- a/webrtc/examples/peerconnection/client/main_wnd.h
+++ b/webrtc/examples/peerconnection/client/main_wnd.h
@@ -17,10 +17,10 @@
#include "webrtc/api/mediastreaminterface.h"
#include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/win32.h"
#include "webrtc/examples/peerconnection/client/peer_connection_client.h"
#include "webrtc/media/base/mediachannel.h"
#include "webrtc/media/base/videocommon.h"
+#include "webrtc/rtc_base/win32.h"
class MainWndCallback {
public:
diff --git a/webrtc/examples/peerconnection/client/peer_connection_client.cc b/webrtc/examples/peerconnection/client/peer_connection_client.cc
index 8c391a8..2f59167 100644
--- a/webrtc/examples/peerconnection/client/peer_connection_client.cc
+++ b/webrtc/examples/peerconnection/client/peer_connection_client.cc
@@ -10,15 +10,15 @@
#include "webrtc/examples/peerconnection/client/peer_connection_client.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/nethelpers.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/thread.h"
#include "webrtc/examples/peerconnection/client/defaults.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/nethelpers.h"
+#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/rtc_base/thread.h"
#ifdef WIN32
-#include "webrtc/base/win32socketserver.h"
+#include "webrtc/rtc_base/win32socketserver.h"
#endif
using rtc::sprintfn;
diff --git a/webrtc/examples/peerconnection/client/peer_connection_client.h b/webrtc/examples/peerconnection/client/peer_connection_client.h
index a15924b..2b4f35c 100644
--- a/webrtc/examples/peerconnection/client/peer_connection_client.h
+++ b/webrtc/examples/peerconnection/client/peer_connection_client.h
@@ -15,10 +15,10 @@
#include <memory>
#include <string>
-#include "webrtc/base/messagehandler.h"
-#include "webrtc/base/nethelpers.h"
-#include "webrtc/base/physicalsocketserver.h"
-#include "webrtc/base/sigslot.h"
+#include "webrtc/rtc_base/messagehandler.h"
+#include "webrtc/rtc_base/nethelpers.h"
+#include "webrtc/rtc_base/physicalsocketserver.h"
+#include "webrtc/rtc_base/sigslot.h"
typedef std::map<int, std::string> Peers;
diff --git a/webrtc/examples/peerconnection/server/peer_channel.cc b/webrtc/examples/peerconnection/server/peer_channel.cc
index 35d592e..5a0585b 100644
--- a/webrtc/examples/peerconnection/server/peer_channel.cc
+++ b/webrtc/examples/peerconnection/server/peer_channel.cc
@@ -18,8 +18,8 @@
#include "webrtc/examples/peerconnection/server/data_socket.h"
#include "webrtc/examples/peerconnection/server/utils.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/stringutils.h"
+#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/rtc_base/stringutils.h"
using rtc::sprintfn;
diff --git a/webrtc/examples/peerconnection/server/utils.cc b/webrtc/examples/peerconnection/server/utils.cc
index 93a6d05..85f5f9e 100644
--- a/webrtc/examples/peerconnection/server/utils.cc
+++ b/webrtc/examples/peerconnection/server/utils.cc
@@ -12,7 +12,7 @@
#include <stdio.h>
-#include "webrtc/base/stringencode.h"
+#include "webrtc/rtc_base/stringencode.h"
using rtc::ToString;
diff --git a/webrtc/examples/relayserver/relayserver_main.cc b/webrtc/examples/relayserver/relayserver_main.cc
index c14ea45..02f5438 100644
--- a/webrtc/examples/relayserver/relayserver_main.cc
+++ b/webrtc/examples/relayserver/relayserver_main.cc
@@ -12,7 +12,7 @@
#include <memory>
#include "webrtc/p2p/base/relayserver.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/thread.h"
int main(int argc, char **argv) {
if (argc != 3) {
diff --git a/webrtc/examples/stunprober/main.cc b/webrtc/examples/stunprober/main.cc
index a3ce992..8c3b424 100644
--- a/webrtc/examples/stunprober/main.cc
+++ b/webrtc/examples/stunprober/main.cc
@@ -16,18 +16,18 @@
#include <map>
#include <memory>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/flags.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/nethelpers.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/timeutils.h"
#include "webrtc/p2p/base/basicpacketsocketfactory.h"
#include "webrtc/p2p/stunprober/stunprober.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/flags.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/nethelpers.h"
+#include "webrtc/rtc_base/network.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/timeutils.h"
using stunprober::StunProber;
using stunprober::AsyncCallback;
diff --git a/webrtc/examples/stunserver/stunserver_main.cc b/webrtc/examples/stunserver/stunserver_main.cc
index 9bdf58a..b084606 100644
--- a/webrtc/examples/stunserver/stunserver_main.cc
+++ b/webrtc/examples/stunserver/stunserver_main.cc
@@ -15,7 +15,7 @@
#include <iostream>
#include "webrtc/p2p/base/stunserver.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/thread.h"
using cricket::StunServer;
diff --git a/webrtc/examples/turnserver/turnserver_main.cc b/webrtc/examples/turnserver/turnserver_main.cc
index e7b464f..c232ce9 100644
--- a/webrtc/examples/turnserver/turnserver_main.cc
+++ b/webrtc/examples/turnserver/turnserver_main.cc
@@ -12,10 +12,10 @@
#include "webrtc/p2p/base/basicpacketsocketfactory.h"
#include "webrtc/p2p/base/turnserver.h"
-#include "webrtc/base/asyncudpsocket.h"
-#include "webrtc/base/optionsfile.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/asyncudpsocket.h"
+#include "webrtc/rtc_base/optionsfile.h"
+#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/rtc_base/thread.h"
static const char kSoftware[] = "libjingle TurnServer";
diff --git a/webrtc/examples/unityplugin/simple_peer_connection.cc b/webrtc/examples/unityplugin/simple_peer_connection.cc
index ee959b7..c302e9c 100644
--- a/webrtc/examples/unityplugin/simple_peer_connection.cc
+++ b/webrtc/examples/unityplugin/simple_peer_connection.cc
@@ -13,9 +13,9 @@
#include <utility>
#include "webrtc/api/test/fakeconstraints.h"
-#include "webrtc/base/json.h"
#include "webrtc/media/engine/webrtcvideocapturerfactory.h"
#include "webrtc/modules/video_capture/video_capture_factory.h"
+#include "webrtc/rtc_base/json.h"
// Names used for a IceCandidate JSON object.
const char kCandidateSdpMidName[] = "sdpMid";
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log.cc b/webrtc/logging/rtc_event_log/rtc_event_log.cc
index 6b07831..c2f17b7 100644
--- a/webrtc/logging/rtc_event_log/rtc_event_log.cc
+++ b/webrtc/logging/rtc_event_log/rtc_event_log.cc
@@ -13,15 +13,6 @@
#include <limits>
#include <vector>
-#include "webrtc/base/atomicops.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/protobuf_utils.h"
-#include "webrtc/base/swap_queue.h"
-#include "webrtc/base/thread_checker.h"
-#include "webrtc/base/timeutils.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.h"
#include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
#include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h"
@@ -37,6 +28,15 @@
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/rtpfb.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sdes.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
+#include "webrtc/rtc_base/atomicops.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/protobuf_utils.h"
+#include "webrtc/rtc_base/swap_queue.h"
+#include "webrtc/rtc_base/thread_checker.h"
+#include "webrtc/rtc_base/timeutils.h"
#include "webrtc/system_wrappers/include/file_wrapper.h"
#ifdef ENABLE_RTC_EVENT_LOG
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log.h b/webrtc/logging/rtc_event_log/rtc_event_log.h
index 0d45552..dc33511 100644
--- a/webrtc/logging/rtc_event_log/rtc_event_log.h
+++ b/webrtc/logging/rtc_event_log/rtc_event_log.h
@@ -15,8 +15,8 @@
#include <string>
#include <vector>
-#include "webrtc/base/platform_file.h"
#include "webrtc/config.h"
+#include "webrtc/rtc_base/platform_file.h"
namespace webrtc {
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log2rtp_dump.cc b/webrtc/logging/rtc_event_log/rtc_event_log2rtp_dump.cc
index e22f1f3..23d6941 100644
--- a/webrtc/logging/rtc_event_log/rtc_event_log2rtp_dump.cc
+++ b/webrtc/logging/rtc_event_log/rtc_event_log2rtp_dump.cc
@@ -14,11 +14,11 @@
#include <string>
#include "gflags/gflags.h"
-#include "webrtc/base/checks.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h"
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
+#include "webrtc/rtc_base/checks.h"
#include "webrtc/test/rtp_file_writer.h"
namespace {
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log2stats.cc b/webrtc/logging/rtc_event_log/rtc_event_log2stats.cc
index 8d24e31..eb290b8 100644
--- a/webrtc/logging/rtc_event_log/rtc_event_log2stats.cc
+++ b/webrtc/logging/rtc_event_log/rtc_event_log2stats.cc
@@ -20,10 +20,10 @@
#include <vector>
#include "gflags/gflags.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/ignore_wundef.h"
-#include "webrtc/base/logging.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/ignore_wundef.h"
+#include "webrtc/rtc_base/logging.h"
// Files generated at build-time by the protobuf compiler.
RTC_PUSH_IGNORING_WUNDEF()
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log2text.cc b/webrtc/logging/rtc_event_log/rtc_event_log2text.cc
index 7467ae6..c17a3b5 100644
--- a/webrtc/logging/rtc_event_log/rtc_event_log2text.cc
+++ b/webrtc/logging/rtc_event_log/rtc_event_log2text.cc
@@ -15,7 +15,6 @@
#include <utility> // pair
#include "gflags/gflags.h"
-#include "webrtc/base/checks.h"
#include "webrtc/common_types.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/bye.h"
@@ -33,6 +32,7 @@
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/tmmbr.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
+#include "webrtc/rtc_base/checks.h"
namespace {
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.cc b/webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.cc
index cdc30f9..a98336f 100644
--- a/webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.cc
+++ b/webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.cc
@@ -12,9 +12,9 @@
#include <algorithm>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/timeutils.h"
#ifdef ENABLE_RTC_EVENT_LOG
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.h b/webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.h
index e8a983c..0d9ad4d 100644
--- a/webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.h
+++ b/webrtc/logging/rtc_event_log/rtc_event_log_helper_thread.h
@@ -17,12 +17,12 @@
#include <utility>
#include <vector>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/ignore_wundef.h"
-#include "webrtc/base/platform_thread.h"
-#include "webrtc/base/protobuf_utils.h"
-#include "webrtc/base/swap_queue.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/ignore_wundef.h"
+#include "webrtc/rtc_base/platform_thread.h"
+#include "webrtc/rtc_base/protobuf_utils.h"
+#include "webrtc/rtc_base/swap_queue.h"
#include "webrtc/system_wrappers/include/file_wrapper.h"
#ifdef ENABLE_RTC_EVENT_LOG
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_parser.cc b/webrtc/logging/rtc_event_log/rtc_event_log_parser.cc
index 78dd4fd..8a8d8e3 100644
--- a/webrtc/logging/rtc_event_log/rtc_event_log_parser.cc
+++ b/webrtc/logging/rtc_event_log/rtc_event_log_parser.cc
@@ -19,13 +19,13 @@
#include <map>
#include <utility>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/protobuf_utils.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
#include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
#include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/protobuf_utils.h"
namespace webrtc {
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_parser.h b/webrtc/logging/rtc_event_log/rtc_event_log_parser.h
index cd431bf..cf2f22e 100644
--- a/webrtc/logging/rtc_event_log/rtc_event_log_parser.h
+++ b/webrtc/logging/rtc_event_log/rtc_event_log_parser.h
@@ -15,10 +15,10 @@
#include <utility> // pair
#include <vector>
-#include "webrtc/base/ignore_wundef.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_header_extension_map.h"
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
+#include "webrtc/rtc_base/ignore_wundef.h"
#include "webrtc/video_receive_stream.h"
#include "webrtc/video_send_stream.h"
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_unittest.cc b/webrtc/logging/rtc_event_log/rtc_event_log_unittest.cc
index 0a13be3..e908ccd 100644
--- a/webrtc/logging/rtc_event_log/rtc_event_log_unittest.cc
+++ b/webrtc/logging/rtc_event_log/rtc_event_log_unittest.cc
@@ -14,10 +14,6 @@
#include <utility>
#include <vector>
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/fakeclock.h"
-#include "webrtc/base/random.h"
#include "webrtc/call/call.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h"
@@ -29,6 +25,10 @@
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/sender_report.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/fakeclock.h"
+#include "webrtc/rtc_base/random.h"
#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
diff --git a/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc b/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc
index 280158d..9d98855 100644
--- a/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc
+++ b/webrtc/logging/rtc_event_log/rtc_event_log_unittest_helper.cc
@@ -15,9 +15,9 @@
#include <string>
#include <vector>
-#include "webrtc/base/checks.h"
#include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
#include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h"
+#include "webrtc/rtc_base/checks.h"
#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
diff --git a/webrtc/media/base/codec.cc b/webrtc/media/base/codec.cc
index 49c990e..a949402 100644
--- a/webrtc/media/base/codec.cc
+++ b/webrtc/media/base/codec.cc
@@ -13,11 +13,11 @@
#include <algorithm>
#include <sstream>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/stringutils.h"
#include "webrtc/media/base/h264_profile_level_id.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/rtc_base/stringutils.h"
namespace cricket {
diff --git a/webrtc/media/base/codec_unittest.cc b/webrtc/media/base/codec_unittest.cc
index f59304c..26966bb 100644
--- a/webrtc/media/base/codec_unittest.cc
+++ b/webrtc/media/base/codec_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/base/gunit.h"
#include "webrtc/media/base/codec.h"
+#include "webrtc/rtc_base/gunit.h"
using cricket::AudioCodec;
using cricket::Codec;
diff --git a/webrtc/media/base/device.h b/webrtc/media/base/device.h
index 621dd15..7eb630f 100644
--- a/webrtc/media/base/device.h
+++ b/webrtc/media/base/device.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_MEDIA_BASE_DEVICE_H_
#define WEBRTC_MEDIA_BASE_DEVICE_H_
-#include "webrtc/base/stringencode.h"
+#include "webrtc/rtc_base/stringencode.h"
namespace cricket {
diff --git a/webrtc/media/base/fakemediaengine.h b/webrtc/media/base/fakemediaengine.h
index 04dfae0..0082391 100644
--- a/webrtc/media/base/fakemediaengine.h
+++ b/webrtc/media/base/fakemediaengine.h
@@ -19,16 +19,16 @@
#include <vector>
#include "webrtc/api/call/audio_sink.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/networkroute.h"
-#include "webrtc/base/stringutils.h"
#include "webrtc/media/base/audiosource.h"
#include "webrtc/media/base/mediaengine.h"
#include "webrtc/media/base/rtputils.h"
#include "webrtc/media/base/streamparams.h"
#include "webrtc/modules/audio_processing/include/audio_processing.h"
#include "webrtc/p2p/base/sessiondescription.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/networkroute.h"
+#include "webrtc/rtc_base/stringutils.h"
using webrtc::RtpExtension;
diff --git a/webrtc/media/base/fakenetworkinterface.h b/webrtc/media/base/fakenetworkinterface.h
index ed8b232..a6a40ed 100644
--- a/webrtc/media/base/fakenetworkinterface.h
+++ b/webrtc/media/base/fakenetworkinterface.h
@@ -14,15 +14,15 @@
#include <map>
#include <vector>
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/dscp.h"
-#include "webrtc/base/messagehandler.h"
-#include "webrtc/base/messagequeue.h"
-#include "webrtc/base/thread.h"
#include "webrtc/media/base/mediachannel.h"
#include "webrtc/media/base/rtputils.h"
+#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/dscp.h"
+#include "webrtc/rtc_base/messagehandler.h"
+#include "webrtc/rtc_base/messagequeue.h"
+#include "webrtc/rtc_base/thread.h"
namespace cricket {
diff --git a/webrtc/media/base/fakertp.cc b/webrtc/media/base/fakertp.cc
index f9c880f..1c67d87 100644
--- a/webrtc/media/base/fakertp.cc
+++ b/webrtc/media/base/fakertp.cc
@@ -10,8 +10,8 @@
#include <algorithm>
-#include "webrtc/base/gunit.h"
#include "webrtc/media/base/fakertp.h"
+#include "webrtc/rtc_base/gunit.h"
void CompareHeaderExtensions(const char* packet1, size_t packet1_size,
const char* packet2, size_t packet2_size,
diff --git a/webrtc/media/base/fakevideocapturer.h b/webrtc/media/base/fakevideocapturer.h
index 34f9dbf..f5148df 100644
--- a/webrtc/media/base/fakevideocapturer.h
+++ b/webrtc/media/base/fakevideocapturer.h
@@ -18,9 +18,9 @@
#include "webrtc/api/video/i420_buffer.h"
#include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/timeutils.h"
#include "webrtc/media/base/videocapturer.h"
#include "webrtc/media/base/videocommon.h"
+#include "webrtc/rtc_base/timeutils.h"
namespace cricket {
diff --git a/webrtc/media/base/fakevideorenderer.h b/webrtc/media/base/fakevideorenderer.h
index a678c97..a6753d2 100644
--- a/webrtc/media/base/fakevideorenderer.h
+++ b/webrtc/media/base/fakevideorenderer.h
@@ -12,9 +12,9 @@
#define WEBRTC_MEDIA_BASE_FAKEVIDEORENDERER_H_
#include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/logging.h"
#include "webrtc/media/base/videosinkinterface.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/logging.h"
namespace cricket {
diff --git a/webrtc/media/base/h264_profile_level_id.cc b/webrtc/media/base/h264_profile_level_id.cc
index a651d53..3f43a30 100644
--- a/webrtc/media/base/h264_profile_level_id.cc
+++ b/webrtc/media/base/h264_profile_level_id.cc
@@ -14,7 +14,7 @@
#include <cstdlib>
#include <cstring>
-#include "webrtc/base/arraysize.h"
+#include "webrtc/rtc_base/arraysize.h"
namespace webrtc {
namespace H264 {
diff --git a/webrtc/media/base/h264_profile_level_id.h b/webrtc/media/base/h264_profile_level_id.h
index de5eedb..7b1d8c5 100644
--- a/webrtc/media/base/h264_profile_level_id.h
+++ b/webrtc/media/base/h264_profile_level_id.h
@@ -14,8 +14,8 @@
#include <map>
#include <string>
-#include "webrtc/base/optional.h"
#include "webrtc/common_types.h"
+#include "webrtc/rtc_base/optional.h"
namespace webrtc {
namespace H264 {
diff --git a/webrtc/media/base/mediachannel.h b/webrtc/media/base/mediachannel.h
index 816dfd1..cc6dbfd 100644
--- a/webrtc/media/base/mediachannel.h
+++ b/webrtc/media/base/mediachannel.h
@@ -17,22 +17,22 @@
#include "webrtc/api/rtpparameters.h"
#include "webrtc/api/rtpreceiverinterface.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/dscp.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/networkroute.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/socket.h"
-#include "webrtc/base/window.h"
#include "webrtc/config.h"
#include "webrtc/media/base/codec.h"
#include "webrtc/media/base/mediaconstants.h"
#include "webrtc/media/base/streamparams.h"
#include "webrtc/media/base/videosinkinterface.h"
#include "webrtc/media/base/videosourceinterface.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/dscp.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/networkroute.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/socket.h"
+#include "webrtc/rtc_base/window.h"
// TODO(juberti): re-evaluate this include
#include "webrtc/pc/audiomonitor.h"
diff --git a/webrtc/media/base/mediaengine.h b/webrtc/media/base/mediaengine.h
index 911b971..8ce6075 100644
--- a/webrtc/media/base/mediaengine.h
+++ b/webrtc/media/base/mediaengine.h
@@ -21,11 +21,11 @@
#include "webrtc/api/audio_codecs/audio_decoder_factory.h"
#include "webrtc/api/audio_codecs/audio_encoder_factory.h"
#include "webrtc/api/rtpparameters.h"
-#include "webrtc/base/fileutils.h"
#include "webrtc/call/audio_state.h"
#include "webrtc/media/base/codec.h"
#include "webrtc/media/base/mediachannel.h"
#include "webrtc/media/base/videocommon.h"
+#include "webrtc/rtc_base/fileutils.h"
#if defined(GOOGLE_CHROME_BUILD) || defined(CHROMIUM_BUILD)
#define DISABLE_MEDIA_ENGINE_FACTORY
diff --git a/webrtc/media/base/rtpdataengine.cc b/webrtc/media/base/rtpdataengine.cc
index 96f5a3b9..89099e7 100644
--- a/webrtc/media/base/rtpdataengine.cc
+++ b/webrtc/media/base/rtpdataengine.cc
@@ -10,15 +10,15 @@
#include "webrtc/media/base/rtpdataengine.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/ratelimiter.h"
-#include "webrtc/base/stringutils.h"
#include "webrtc/media/base/codec.h"
#include "webrtc/media/base/mediaconstants.h"
#include "webrtc/media/base/rtputils.h"
#include "webrtc/media/base/streamparams.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/ratelimiter.h"
+#include "webrtc/rtc_base/stringutils.h"
namespace cricket {
diff --git a/webrtc/media/base/rtpdataengine_unittest.cc b/webrtc/media/base/rtpdataengine_unittest.cc
index dca509d..a06040a 100644
--- a/webrtc/media/base/rtpdataengine_unittest.cc
+++ b/webrtc/media/base/rtpdataengine_unittest.cc
@@ -11,14 +11,14 @@
#include <memory>
#include <string>
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/ssladapter.h"
#include "webrtc/media/base/fakenetworkinterface.h"
#include "webrtc/media/base/mediaconstants.h"
#include "webrtc/media/base/rtpdataengine.h"
#include "webrtc/media/base/rtputils.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/ssladapter.h"
class FakeDataReceiver : public sigslot::has_slots<> {
public:
diff --git a/webrtc/media/base/rtputils.cc b/webrtc/media/base/rtputils.cc
index 1f81d62..ea1c919 100644
--- a/webrtc/media/base/rtputils.cc
+++ b/webrtc/media/base/rtputils.cc
@@ -12,10 +12,10 @@
// PacketTimeUpdateParams is defined in asyncpacketsocket.h.
// TODO(sergeyu): Find more appropriate place for PacketTimeUpdateParams.
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/messagedigest.h"
#include "webrtc/media/base/turnutils.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/messagedigest.h"
namespace cricket {
diff --git a/webrtc/media/base/rtputils.h b/webrtc/media/base/rtputils.h
index f7aa85c..a823cf7 100644
--- a/webrtc/media/base/rtputils.h
+++ b/webrtc/media/base/rtputils.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_MEDIA_BASE_RTPUTILS_H_
#define WEBRTC_MEDIA_BASE_RTPUTILS_H_
-#include "webrtc/base/byteorder.h"
+#include "webrtc/rtc_base/byteorder.h"
namespace rtc {
struct PacketTimeUpdateParams;
diff --git a/webrtc/media/base/rtputils_unittest.cc b/webrtc/media/base/rtputils_unittest.cc
index e6597bd..2a998ea 100644
--- a/webrtc/media/base/rtputils_unittest.cc
+++ b/webrtc/media/base/rtputils_unittest.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/media/base/fakertp.h"
#include "webrtc/media/base/rtputils.h"
+#include "webrtc/media/base/fakertp.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/gunit.h"
namespace cricket {
diff --git a/webrtc/media/base/streamparams.h b/webrtc/media/base/streamparams.h
index 5d7feaf..1fc8134 100644
--- a/webrtc/media/base/streamparams.h
+++ b/webrtc/media/base/streamparams.h
@@ -33,7 +33,7 @@
#include <string>
#include <vector>
-#include "webrtc/base/constructormagic.h"
+#include "webrtc/rtc_base/constructormagic.h"
namespace cricket {
diff --git a/webrtc/media/base/streamparams_unittest.cc b/webrtc/media/base/streamparams_unittest.cc
index dc48a72..9dc034c 100644
--- a/webrtc/media/base/streamparams_unittest.cc
+++ b/webrtc/media/base/streamparams_unittest.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/gunit.h"
#include "webrtc/media/base/streamparams.h"
#include "webrtc/media/base/testutils.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/gunit.h"
static const uint32_t kSsrcs1[] = {1};
static const uint32_t kSsrcs2[] = {1, 2};
diff --git a/webrtc/media/base/testutils.cc b/webrtc/media/base/testutils.cc
index aa92aea..ac40df8 100644
--- a/webrtc/media/base/testutils.cc
+++ b/webrtc/media/base/testutils.cc
@@ -15,14 +15,14 @@
#include <memory>
#include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/fileutils.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/pathutils.h"
-#include "webrtc/base/stream.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/testutils.h"
#include "webrtc/media/base/videocapturer.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/fileutils.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/pathutils.h"
+#include "webrtc/rtc_base/stream.h"
+#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/rtc_base/testutils.h"
namespace cricket {
diff --git a/webrtc/media/base/testutils.h b/webrtc/media/base/testutils.h
index f7cb934..a7cb216 100644
--- a/webrtc/media/base/testutils.h
+++ b/webrtc/media/base/testutils.h
@@ -14,13 +14,13 @@
#include <string>
#include <vector>
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/window.h"
#include "webrtc/media/base/mediachannel.h"
#include "webrtc/media/base/videocapturer.h"
#include "webrtc/media/base/videocommon.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/window.h"
namespace rtc {
class ByteBufferReader;
diff --git a/webrtc/media/base/turnutils.cc b/webrtc/media/base/turnutils.cc
index 1fd3960..f1daec4 100644
--- a/webrtc/media/base/turnutils.cc
+++ b/webrtc/media/base/turnutils.cc
@@ -10,9 +10,9 @@
#include "webrtc/media/base/turnutils.h"
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/checks.h"
#include "webrtc/p2p/base/stun.h"
+#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/rtc_base/checks.h"
namespace cricket {
diff --git a/webrtc/media/base/turnutils_unittest.cc b/webrtc/media/base/turnutils_unittest.cc
index 1a9951b..72b1f7b 100644
--- a/webrtc/media/base/turnutils_unittest.cc
+++ b/webrtc/media/base/turnutils_unittest.cc
@@ -12,7 +12,7 @@
#include <stddef.h>
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
namespace cricket {
diff --git a/webrtc/media/base/videoadapter.cc b/webrtc/media/base/videoadapter.cc
index bee2a57..73a5638 100644
--- a/webrtc/media/base/videoadapter.cc
+++ b/webrtc/media/base/videoadapter.cc
@@ -15,12 +15,12 @@
#include <cstdlib>
#include <limits>
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/optional.h"
#include "webrtc/media/base/mediaconstants.h"
#include "webrtc/media/base/videocommon.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/optional.h"
namespace {
struct Fraction {
diff --git a/webrtc/media/base/videoadapter.h b/webrtc/media/base/videoadapter.h
index eb2257b..135f411b 100644
--- a/webrtc/media/base/videoadapter.h
+++ b/webrtc/media/base/videoadapter.h
@@ -11,10 +11,10 @@
#ifndef WEBRTC_MEDIA_BASE_VIDEOADAPTER_H_
#define WEBRTC_MEDIA_BASE_VIDEOADAPTER_H_
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/optional.h"
#include "webrtc/media/base/videocommon.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/optional.h"
namespace cricket {
diff --git a/webrtc/media/base/videoadapter_unittest.cc b/webrtc/media/base/videoadapter_unittest.cc
index cd9df98..d3a66c1 100644
--- a/webrtc/media/base/videoadapter_unittest.cc
+++ b/webrtc/media/base/videoadapter_unittest.cc
@@ -14,12 +14,12 @@
#include <string>
#include <vector>
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
#include "webrtc/media/base/fakevideocapturer.h"
#include "webrtc/media/base/mediachannel.h"
#include "webrtc/media/base/testutils.h"
#include "webrtc/media/base/videoadapter.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/logging.h"
namespace cricket {
namespace {
diff --git a/webrtc/media/base/videobroadcaster.cc b/webrtc/media/base/videobroadcaster.cc
index c5b1484..8bd65c4 100644
--- a/webrtc/media/base/videobroadcaster.cc
+++ b/webrtc/media/base/videobroadcaster.cc
@@ -13,8 +13,8 @@
#include <limits>
#include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
namespace rtc {
diff --git a/webrtc/media/base/videobroadcaster.h b/webrtc/media/base/videobroadcaster.h
index ccf5b3d..312ec7b 100644
--- a/webrtc/media/base/videobroadcaster.h
+++ b/webrtc/media/base/videobroadcaster.h
@@ -16,10 +16,10 @@
#include <vector>
#include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/thread_checker.h"
#include "webrtc/media/base/videosinkinterface.h"
#include "webrtc/media/base/videosourcebase.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/thread_checker.h"
namespace rtc {
diff --git a/webrtc/media/base/videobroadcaster_unittest.cc b/webrtc/media/base/videobroadcaster_unittest.cc
index ad9ccb7..5e934e7 100644
--- a/webrtc/media/base/videobroadcaster_unittest.cc
+++ b/webrtc/media/base/videobroadcaster_unittest.cc
@@ -8,11 +8,11 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "webrtc/media/base/videobroadcaster.h"
#include "webrtc/api/video/i420_buffer.h"
#include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/gunit.h"
#include "webrtc/media/base/fakevideorenderer.h"
-#include "webrtc/media/base/videobroadcaster.h"
+#include "webrtc/rtc_base/gunit.h"
using rtc::VideoBroadcaster;
using rtc::VideoSinkWants;
diff --git a/webrtc/media/base/videocapturer.cc b/webrtc/media/base/videocapturer.cc
index df1eafc..b65eeec 100644
--- a/webrtc/media/base/videocapturer.cc
+++ b/webrtc/media/base/videocapturer.cc
@@ -16,7 +16,7 @@
#include "webrtc/api/video/i420_buffer.h"
#include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
namespace cricket {
diff --git a/webrtc/media/base/videocapturer.h b/webrtc/media/base/videocapturer.h
index 76ab95a..a65d40e 100644
--- a/webrtc/media/base/videocapturer.h
+++ b/webrtc/media/base/videocapturer.h
@@ -20,15 +20,15 @@
#include <string>
#include <vector>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/media/base/videosourceinterface.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread_checker.h"
-#include "webrtc/base/timestampaligner.h"
#include "webrtc/media/base/videoadapter.h"
#include "webrtc/media/base/videobroadcaster.h"
#include "webrtc/media/base/videocommon.h"
+#include "webrtc/media/base/videosourceinterface.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/thread_checker.h"
+#include "webrtc/rtc_base/timestampaligner.h"
namespace webrtc {
class VideoFrame;
diff --git a/webrtc/media/base/videocapturer_unittest.cc b/webrtc/media/base/videocapturer_unittest.cc
index 2dc5cec..402682e 100644
--- a/webrtc/media/base/videocapturer_unittest.cc
+++ b/webrtc/media/base/videocapturer_unittest.cc
@@ -13,13 +13,13 @@
#include <memory>
#include <vector>
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/thread.h"
#include "webrtc/media/base/fakevideocapturer.h"
#include "webrtc/media/base/fakevideorenderer.h"
#include "webrtc/media/base/testutils.h"
#include "webrtc/media/base/videocapturer.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/thread.h"
using cricket::FakeVideoCapturer;
diff --git a/webrtc/media/base/videocommon.cc b/webrtc/media/base/videocommon.cc
index ec1255a..4bc0267 100644
--- a/webrtc/media/base/videocommon.cc
+++ b/webrtc/media/base/videocommon.cc
@@ -14,7 +14,7 @@
#include <math.h>
#include <sstream>
-#include "webrtc/base/arraysize.h"
+#include "webrtc/rtc_base/arraysize.h"
namespace cricket {
diff --git a/webrtc/media/base/videocommon.h b/webrtc/media/base/videocommon.h
index 47cfb85..10ad383 100644
--- a/webrtc/media/base/videocommon.h
+++ b/webrtc/media/base/videocommon.h
@@ -17,7 +17,7 @@
#include <string>
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/timeutils.h"
namespace cricket {
diff --git a/webrtc/media/base/videocommon_unittest.cc b/webrtc/media/base/videocommon_unittest.cc
index c28a5d2..8430b80 100644
--- a/webrtc/media/base/videocommon_unittest.cc
+++ b/webrtc/media/base/videocommon_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/base/gunit.h"
#include "webrtc/media/base/videocommon.h"
+#include "webrtc/rtc_base/gunit.h"
namespace cricket {
diff --git a/webrtc/media/base/videoengine_unittest.h b/webrtc/media/base/videoengine_unittest.h
index ac430b2..77062ec 100644
--- a/webrtc/media/base/videoengine_unittest.h
+++ b/webrtc/media/base/videoengine_unittest.h
@@ -15,9 +15,6 @@
#include <string>
#include <vector>
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/timeutils.h"
#include "webrtc/call/call.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
#include "webrtc/media/base/fakenetworkinterface.h"
@@ -26,6 +23,9 @@
#include "webrtc/media/base/mediachannel.h"
#include "webrtc/media/base/streamparams.h"
#include "webrtc/media/engine/fakewebrtccall.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/timeutils.h"
#define EXPECT_FRAME_WAIT(c, w, h, t) \
EXPECT_EQ_WAIT((c), renderer_.num_rendered_frames(), (t)); \
diff --git a/webrtc/media/base/videosourcebase.cc b/webrtc/media/base/videosourcebase.cc
index 514072e..222adc4 100644
--- a/webrtc/media/base/videosourcebase.cc
+++ b/webrtc/media/base/videosourcebase.cc
@@ -10,7 +10,7 @@
#include "webrtc/media/base/videosourcebase.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace rtc {
diff --git a/webrtc/media/base/videosourcebase.h b/webrtc/media/base/videosourcebase.h
index 36c6e4e..c83abb5 100644
--- a/webrtc/media/base/videosourcebase.h
+++ b/webrtc/media/base/videosourcebase.h
@@ -14,8 +14,8 @@
#include <vector>
#include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/thread_checker.h"
#include "webrtc/media/base/videosourceinterface.h"
+#include "webrtc/rtc_base/thread_checker.h"
namespace rtc {
diff --git a/webrtc/media/base/videosourceinterface.h b/webrtc/media/base/videosourceinterface.h
index e7c0d38..6ebff33 100644
--- a/webrtc/media/base/videosourceinterface.h
+++ b/webrtc/media/base/videosourceinterface.h
@@ -12,7 +12,7 @@
#define WEBRTC_MEDIA_BASE_VIDEOSOURCEINTERFACE_H_
#include "webrtc/media/base/videosinkinterface.h"
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
namespace rtc {
diff --git a/webrtc/media/engine/adm_helpers.cc b/webrtc/media/engine/adm_helpers.cc
index d8409f0..7902889 100644
--- a/webrtc/media/engine/adm_helpers.cc
+++ b/webrtc/media/engine/adm_helpers.cc
@@ -10,8 +10,8 @@
#include "webrtc/media/engine/adm_helpers.h"
-#include "webrtc/base/logging.h"
#include "webrtc/modules/audio_device/include/audio_device.h"
+#include "webrtc/rtc_base/logging.h"
namespace webrtc {
namespace adm_helpers {
diff --git a/webrtc/media/engine/apm_helpers.cc b/webrtc/media/engine/apm_helpers.cc
index e11cac73..784b47c 100644
--- a/webrtc/media/engine/apm_helpers.cc
+++ b/webrtc/media/engine/apm_helpers.cc
@@ -10,9 +10,9 @@
#include "webrtc/media/engine/apm_helpers.h"
-#include "webrtc/base/logging.h"
#include "webrtc/modules/audio_device/include/audio_device.h"
#include "webrtc/modules/audio_processing/include/audio_processing.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/voice_engine/transmit_mixer.h"
namespace webrtc {
diff --git a/webrtc/media/engine/fakewebrtccall.cc b/webrtc/media/engine/fakewebrtccall.cc
index ec8f6b8..018fb34 100644
--- a/webrtc/media/engine/fakewebrtccall.cc
+++ b/webrtc/media/engine/fakewebrtccall.cc
@@ -14,10 +14,10 @@
#include <utility>
#include "webrtc/api/call/audio_sink.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/platform_file.h"
-#include "webrtc/base/gunit.h"
#include "webrtc/media/base/rtputils.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/platform_file.h"
namespace cricket {
FakeAudioSendStream::FakeAudioSendStream(
diff --git a/webrtc/media/engine/fakewebrtccall.h b/webrtc/media/engine/fakewebrtccall.h
index 34db106..61edb3c 100644
--- a/webrtc/media/engine/fakewebrtccall.h
+++ b/webrtc/media/engine/fakewebrtccall.h
@@ -25,11 +25,11 @@
#include <vector>
#include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/buffer.h"
#include "webrtc/call/audio_receive_stream.h"
#include "webrtc/call/audio_send_stream.h"
#include "webrtc/call/call.h"
#include "webrtc/call/flexfec_receive_stream.h"
+#include "webrtc/rtc_base/buffer.h"
#include "webrtc/video_receive_stream.h"
#include "webrtc/video_send_stream.h"
diff --git a/webrtc/media/engine/fakewebrtcdeviceinfo.h b/webrtc/media/engine/fakewebrtcdeviceinfo.h
index 0e34001..38f9810 100644
--- a/webrtc/media/engine/fakewebrtcdeviceinfo.h
+++ b/webrtc/media/engine/fakewebrtcdeviceinfo.h
@@ -13,8 +13,8 @@
#include <vector>
-#include "webrtc/base/stringutils.h"
#include "webrtc/media/engine/webrtcvideocapturer.h"
+#include "webrtc/rtc_base/stringutils.h"
// Fake class for mocking out webrtc::VideoCaptureModule::DeviceInfo.
class FakeWebRtcDeviceInfo : public webrtc::VideoCaptureModule::DeviceInfo {
diff --git a/webrtc/media/engine/fakewebrtcvideoengine.h b/webrtc/media/engine/fakewebrtcvideoengine.h
index 081005d..604728c 100644
--- a/webrtc/media/engine/fakewebrtcvideoengine.h
+++ b/webrtc/media/engine/fakewebrtcvideoengine.h
@@ -18,15 +18,15 @@
#include "webrtc/api/video_codecs/video_decoder.h"
#include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/thread_annotations.h"
#include "webrtc/media/base/codec.h"
#include "webrtc/media/engine/webrtcvideodecoderfactory.h"
#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
#include "webrtc/modules/video_coding/include/video_error_codes.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/rtc_base/thread_annotations.h"
namespace cricket {
static const int kEventTimeoutMs = 10000;
diff --git a/webrtc/media/engine/fakewebrtcvoiceengine.h b/webrtc/media/engine/fakewebrtcvoiceengine.h
index f8343f2..b6f5ed7 100644
--- a/webrtc/media/engine/fakewebrtcvoiceengine.h
+++ b/webrtc/media/engine/fakewebrtcvoiceengine.h
@@ -14,8 +14,8 @@
#include <map>
#include <vector>
-#include "webrtc/base/checks.h"
#include "webrtc/media/engine/webrtcvoe.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
namespace voe {
diff --git a/webrtc/media/engine/internaldecoderfactory.cc b/webrtc/media/engine/internaldecoderfactory.cc
index 5bc8c4b..7a1c099 100644
--- a/webrtc/media/engine/internaldecoderfactory.cc
+++ b/webrtc/media/engine/internaldecoderfactory.cc
@@ -12,10 +12,10 @@
#include <utility>
-#include "webrtc/base/logging.h"
#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/rtc_base/logging.h"
namespace cricket {
diff --git a/webrtc/media/engine/payload_type_mapper.h b/webrtc/media/engine/payload_type_mapper.h
index e634c9a..1a74f21 100644
--- a/webrtc/media/engine/payload_type_mapper.h
+++ b/webrtc/media/engine/payload_type_mapper.h
@@ -15,8 +15,8 @@
#include <set>
#include "webrtc/api/audio_codecs/audio_format.h"
-#include "webrtc/base/optional.h"
#include "webrtc/media/base/codec.h"
+#include "webrtc/rtc_base/optional.h"
namespace cricket {
diff --git a/webrtc/media/engine/simulcast.cc b/webrtc/media/engine/simulcast.cc
index f1cd2ce..d00f5d8 100644
--- a/webrtc/media/engine/simulcast.cc
+++ b/webrtc/media/engine/simulcast.cc
@@ -10,11 +10,11 @@
#include <stdio.h>
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/logging.h"
#include "webrtc/media/base/streamparams.h"
#include "webrtc/media/engine/constants.h"
#include "webrtc/media/engine/simulcast.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/system_wrappers/include/field_trial.h"
namespace cricket {
diff --git a/webrtc/media/engine/simulcast.h b/webrtc/media/engine/simulcast.h
index 3aae70f..4531bcc 100644
--- a/webrtc/media/engine/simulcast.h
+++ b/webrtc/media/engine/simulcast.h
@@ -13,8 +13,8 @@
#include <vector>
-#include "webrtc/base/basictypes.h"
#include "webrtc/config.h"
+#include "webrtc/rtc_base/basictypes.h"
namespace cricket {
struct StreamParams;
diff --git a/webrtc/media/engine/videodecodersoftwarefallbackwrapper.cc b/webrtc/media/engine/videodecodersoftwarefallbackwrapper.cc
index 34d851e..f5b54e1 100644
--- a/webrtc/media/engine/videodecodersoftwarefallbackwrapper.cc
+++ b/webrtc/media/engine/videodecodersoftwarefallbackwrapper.cc
@@ -12,11 +12,11 @@
#include <string>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/trace_event.h"
#include "webrtc/media/engine/internaldecoderfactory.h"
#include "webrtc/modules/video_coding/include/video_error_codes.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/trace_event.h"
namespace webrtc {
diff --git a/webrtc/media/engine/videodecodersoftwarefallbackwrapper_unittest.cc b/webrtc/media/engine/videodecodersoftwarefallbackwrapper_unittest.cc
index 4ac8485..b4fc7ca 100644
--- a/webrtc/media/engine/videodecodersoftwarefallbackwrapper_unittest.cc
+++ b/webrtc/media/engine/videodecodersoftwarefallbackwrapper_unittest.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/api/video_codecs/video_decoder.h"
-#include "webrtc/base/checks.h"
#include "webrtc/media/engine/videodecodersoftwarefallbackwrapper.h"
+#include "webrtc/api/video_codecs/video_decoder.h"
#include "webrtc/modules/video_coding/include/video_error_codes.h"
+#include "webrtc/rtc_base/checks.h"
#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc b/webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc
index 8bf3ed4..d9d6f32 100644
--- a/webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc
+++ b/webrtc/media/engine/videoencodersoftwarefallbackwrapper.cc
@@ -10,9 +10,9 @@
#include "webrtc/media/engine/videoencodersoftwarefallbackwrapper.h"
-#include "webrtc/base/logging.h"
#include "webrtc/media/engine/internalencoderfactory.h"
#include "webrtc/modules/video_coding/include/video_error_codes.h"
+#include "webrtc/rtc_base/logging.h"
namespace webrtc {
diff --git a/webrtc/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc b/webrtc/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc
index ae6e4d9..e196587 100644
--- a/webrtc/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc
+++ b/webrtc/media/engine/videoencodersoftwarefallbackwrapper_unittest.cc
@@ -13,11 +13,11 @@
#include <utility>
#include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/base/checks.h"
#include "webrtc/modules/video_coding/codecs/vp8/simulcast_rate_allocator.h"
#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h"
#include "webrtc/modules/video_coding/include/video_codec_interface.h"
#include "webrtc/modules/video_coding/include/video_error_codes.h"
+#include "webrtc/rtc_base/checks.h"
#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/webrtc/media/engine/webrtcvideocapturer.cc b/webrtc/media/engine/webrtcvideocapturer.cc
index 9e5c921..3560098 100644
--- a/webrtc/media/engine/webrtcvideocapturer.cc
+++ b/webrtc/media/engine/webrtcvideocapturer.cc
@@ -10,17 +10,17 @@
#include "webrtc/media/engine/webrtcvideocapturer.h"
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/safe_conversions.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/safe_conversions.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/timeutils.h"
-#include "webrtc/base/win32.h" // Need this to #include the impl files.
#include "webrtc/modules/video_capture/video_capture_factory.h"
+#include "webrtc/rtc_base/win32.h" // Need this to #include the impl files.
#include "webrtc/system_wrappers/include/field_trial.h"
namespace cricket {
diff --git a/webrtc/media/engine/webrtcvideocapturer.h b/webrtc/media/engine/webrtcvideocapturer.h
index 1687ce8..1cbfa08 100644
--- a/webrtc/media/engine/webrtcvideocapturer.h
+++ b/webrtc/media/engine/webrtcvideocapturer.h
@@ -15,13 +15,13 @@
#include <string>
#include <vector>
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/messagehandler.h"
-#include "webrtc/base/scoped_ref_ptr.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/media/base/device.h"
#include "webrtc/media/base/videocapturer.h"
#include "webrtc/modules/video_capture/video_capture.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/messagehandler.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
namespace cricket {
diff --git a/webrtc/media/engine/webrtcvideocapturer_unittest.cc b/webrtc/media/engine/webrtcvideocapturer_unittest.cc
index f660e43..a4414f1 100644
--- a/webrtc/media/engine/webrtcvideocapturer_unittest.cc
+++ b/webrtc/media/engine/webrtcvideocapturer_unittest.cc
@@ -15,14 +15,14 @@
#include <memory>
#include <vector>
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/thread.h"
#include "webrtc/media/base/testutils.h"
#include "webrtc/media/base/videocommon.h"
#include "webrtc/media/engine/fakewebrtcvcmfactory.h"
#include "webrtc/media/engine/webrtcvideocapturer.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/rtc_base/thread.h"
using cricket::VideoFormat;
diff --git a/webrtc/media/engine/webrtcvideodecoderfactory.h b/webrtc/media/engine/webrtcvideodecoderfactory.h
index 7f0921f..64a8faa 100644
--- a/webrtc/media/engine/webrtcvideodecoderfactory.h
+++ b/webrtc/media/engine/webrtcvideodecoderfactory.h
@@ -11,8 +11,8 @@
#ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_
#define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEODECODERFACTORY_H_
-#include "webrtc/base/refcount.h"
#include "webrtc/common_types.h"
+#include "webrtc/rtc_base/refcount.h"
namespace webrtc {
class VideoDecoder;
diff --git a/webrtc/media/engine/webrtcvideoengine.cc b/webrtc/media/engine/webrtcvideoengine.cc
index e592740..c5d49f5 100644
--- a/webrtc/media/engine/webrtcvideoengine.cc
+++ b/webrtc/media/engine/webrtcvideoengine.cc
@@ -19,23 +19,23 @@
#include "webrtc/api/video/i420_buffer.h"
#include "webrtc/api/video_codecs/video_decoder.h"
#include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/timeutils.h"
-#include "webrtc/base/trace_event.h"
#include "webrtc/call/call.h"
#include "webrtc/common_video/h264/profile_level_id.h"
#include "webrtc/media/engine/constants.h"
-#include "webrtc/media/engine/internalencoderfactory.h"
#include "webrtc/media/engine/internaldecoderfactory.h"
+#include "webrtc/media/engine/internalencoderfactory.h"
#include "webrtc/media/engine/simulcast.h"
-#include "webrtc/media/engine/videoencodersoftwarefallbackwrapper.h"
#include "webrtc/media/engine/videodecodersoftwarefallbackwrapper.h"
+#include "webrtc/media/engine/videoencodersoftwarefallbackwrapper.h"
#include "webrtc/media/engine/webrtcmediaengine.h"
#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
#include "webrtc/media/engine/webrtcvoiceengine.h"
#include "webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/rtc_base/trace_event.h"
#include "webrtc/system_wrappers/include/field_trial.h"
using DegradationPreference = webrtc::VideoSendStream::DegradationPreference;
diff --git a/webrtc/media/engine/webrtcvideoengine.h b/webrtc/media/engine/webrtcvideoengine.h
index c51aa69..0d51aa7 100644
--- a/webrtc/media/engine/webrtcvideoengine.h
+++ b/webrtc/media/engine/webrtcvideoengine.h
@@ -19,12 +19,6 @@
#include "webrtc/api/call/transport.h"
#include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/networkroute.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/thread_annotations.h"
-#include "webrtc/base/thread_checker.h"
#include "webrtc/call/call.h"
#include "webrtc/call/flexfec_receive_stream.h"
#include "webrtc/media/base/mediaengine.h"
@@ -32,6 +26,12 @@
#include "webrtc/media/base/videosourceinterface.h"
#include "webrtc/media/engine/webrtcvideodecoderfactory.h"
#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/networkroute.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/thread_annotations.h"
+#include "webrtc/rtc_base/thread_checker.h"
#include "webrtc/video_receive_stream.h"
#include "webrtc/video_send_stream.h"
diff --git a/webrtc/media/engine/webrtcvideoengine_unittest.cc b/webrtc/media/engine/webrtcvideoengine_unittest.cc
index e14f326..9d4c809 100644
--- a/webrtc/media/engine/webrtcvideoengine_unittest.cc
+++ b/webrtc/media/engine/webrtcvideoengine_unittest.cc
@@ -14,9 +14,6 @@
#include <vector>
#include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/stringutils.h"
#include "webrtc/call/flexfec_receive_stream.h"
#include "webrtc/common_video/h264/profile_level_id.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
@@ -30,6 +27,9 @@
#include "webrtc/media/engine/simulcast.h"
#include "webrtc/media/engine/webrtcvideoengine.h"
#include "webrtc/media/engine/webrtcvoiceengine.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/stringutils.h"
#include "webrtc/test/field_trial.h"
using webrtc::RtpExtension;
diff --git a/webrtc/media/engine/webrtcvoiceengine.cc b/webrtc/media/engine/webrtcvoiceengine.cc
index 1f97949..8b269c4 100644
--- a/webrtc/media/engine/webrtcvoiceengine.cc
+++ b/webrtc/media/engine/webrtcvoiceengine.cc
@@ -19,16 +19,6 @@
#include <vector>
#include "webrtc/api/call/audio_sink.h"
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/base64.h"
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/race_checker.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/trace_event.h"
#include "webrtc/media/base/audiosource.h"
#include "webrtc/media/base/mediaconstants.h"
#include "webrtc/media/base/streamparams.h"
@@ -40,6 +30,16 @@
#include "webrtc/modules/audio_mixer/audio_mixer_impl.h"
#include "webrtc/modules/audio_processing/aec_dump/aec_dump_factory.h"
#include "webrtc/modules/audio_processing/include/audio_processing.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/base64.h"
+#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/race_checker.h"
+#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/rtc_base/trace_event.h"
#include "webrtc/system_wrappers/include/field_trial.h"
#include "webrtc/system_wrappers/include/metrics.h"
#include "webrtc/system_wrappers/include/trace.h"
diff --git a/webrtc/media/engine/webrtcvoiceengine.h b/webrtc/media/engine/webrtcvoiceengine.h
index d154d0a..93101fc 100644
--- a/webrtc/media/engine/webrtcvoiceengine.h
+++ b/webrtc/media/engine/webrtcvoiceengine.h
@@ -18,12 +18,6 @@
#include "webrtc/api/audio_codecs/audio_encoder_factory.h"
#include "webrtc/api/rtpreceiverinterface.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/networkroute.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/task_queue.h"
-#include "webrtc/base/thread_checker.h"
#include "webrtc/call/audio_state.h"
#include "webrtc/call/call.h"
#include "webrtc/config.h"
@@ -33,6 +27,12 @@
#include "webrtc/media/engine/webrtcvoe.h"
#include "webrtc/modules/audio_processing/include/audio_processing.h"
#include "webrtc/pc/channel.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/networkroute.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/task_queue.h"
+#include "webrtc/rtc_base/thread_checker.h"
namespace webrtc {
namespace voe {
diff --git a/webrtc/media/engine/webrtcvoiceengine_unittest.cc b/webrtc/media/engine/webrtcvoiceengine_unittest.cc
index 85158d8..334e63f 100644
--- a/webrtc/media/engine/webrtcvoiceengine_unittest.cc
+++ b/webrtc/media/engine/webrtcvoiceengine_unittest.cc
@@ -12,10 +12,6 @@
#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h"
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/safe_conversions.h"
-#include "webrtc/base/scoped_ref_ptr.h"
#include "webrtc/call/call.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
#include "webrtc/media/base/fakemediaengine.h"
@@ -28,6 +24,10 @@
#include "webrtc/modules/audio_device/include/mock_audio_device.h"
#include "webrtc/modules/audio_processing/include/mock_audio_processing.h"
#include "webrtc/pc/channel.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/rtc_base/safe_conversions.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
#include "webrtc/test/field_trial.h"
#include "webrtc/test/gtest.h"
#include "webrtc/test/mock_audio_decoder_factory.h"
diff --git a/webrtc/media/sctp/sctptransport.cc b/webrtc/media/sctp/sctptransport.cc
index 45e8dec..2dcc339 100644
--- a/webrtc/media/sctp/sctptransport.cc
+++ b/webrtc/media/sctp/sctptransport.cc
@@ -27,18 +27,18 @@
#include <sstream>
#include "usrsctplib/usrsctp.h"
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/safe_conversions.h"
-#include "webrtc/base/thread_checker.h"
-#include "webrtc/base/trace_event.h"
#include "webrtc/media/base/codec.h"
#include "webrtc/media/base/mediaconstants.h"
#include "webrtc/media/base/streamparams.h"
#include "webrtc/p2p/base/dtlstransportinternal.h" // For PF_NORMAL
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/safe_conversions.h"
+#include "webrtc/rtc_base/thread_checker.h"
+#include "webrtc/rtc_base/trace_event.h"
namespace {
diff --git a/webrtc/media/sctp/sctptransport.h b/webrtc/media/sctp/sctptransport.h
index b34db80..8733603 100644
--- a/webrtc/media/sctp/sctptransport.h
+++ b/webrtc/media/sctp/sctptransport.h
@@ -18,11 +18,11 @@
#include <string>
#include <vector>
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/thread.h"
// For SendDataParams/ReceiveDataParams.
#include "webrtc/media/base/mediachannel.h"
#include "webrtc/media/sctp/sctptransportinternal.h"
diff --git a/webrtc/media/sctp/sctptransport_unittest.cc b/webrtc/media/sctp/sctptransport_unittest.cc
index b8495d0..b2d7848 100644
--- a/webrtc/media/sctp/sctptransport_unittest.cc
+++ b/webrtc/media/sctp/sctptransport_unittest.cc
@@ -16,15 +16,15 @@
#include <string>
#include <vector>
-#include "webrtc/base/bind.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/thread.h"
#include "webrtc/media/sctp/sctptransport.h"
#include "webrtc/p2p/base/fakedtlstransport.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/thread.h"
namespace {
static const int kDefaultTimeout = 10000; // 10 seconds.
diff --git a/webrtc/media/sctp/sctptransportinternal.h b/webrtc/media/sctp/sctptransportinternal.h
index e0f44e5..620fdd6 100644
--- a/webrtc/media/sctp/sctptransportinternal.h
+++ b/webrtc/media/sctp/sctptransportinternal.h
@@ -18,8 +18,8 @@
#include <string>
#include <vector>
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/thread.h"
// For SendDataParams/ReceiveDataParams.
// TODO(deadbeef): Use something else for SCTP. It's confusing that we use an
// SSRC field for SID.
diff --git a/webrtc/ortc/ortcfactory.cc b/webrtc/ortc/ortcfactory.cc
index 612e55d..1d96873 100644
--- a/webrtc/ortc/ortcfactory.cc
+++ b/webrtc/ortc/ortcfactory.cc
@@ -20,11 +20,6 @@
#include "webrtc/api/proxy.h"
#include "webrtc/api/rtcerror.h"
#include "webrtc/api/videosourceproxy.h"
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
#include "webrtc/media/base/mediaconstants.h"
#include "webrtc/modules/audio_processing/include/audio_processing.h"
@@ -40,6 +35,11 @@
#include "webrtc/pc/localaudiosource.h"
#include "webrtc/pc/videocapturertracksource.h"
#include "webrtc/pc/videotrack.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
namespace {
diff --git a/webrtc/ortc/ortcfactory.h b/webrtc/ortc/ortcfactory.h
index d82d6d0..2ce7be3 100644
--- a/webrtc/ortc/ortcfactory.h
+++ b/webrtc/ortc/ortcfactory.h
@@ -15,11 +15,11 @@
#include <string>
#include "webrtc/api/ortc/ortcfactoryinterface.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/scoped_ref_ptr.h"
#include "webrtc/media/base/mediaengine.h"
#include "webrtc/media/engine/webrtcmediaengine.h"
#include "webrtc/pc/channelmanager.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
namespace webrtc {
diff --git a/webrtc/ortc/ortcfactory_integrationtest.cc b/webrtc/ortc/ortcfactory_integrationtest.cc
index a800025..ddd0e1a 100644
--- a/webrtc/ortc/ortcfactory_integrationtest.cc
+++ b/webrtc/ortc/ortcfactory_integrationtest.cc
@@ -12,15 +12,15 @@
#include <utility> // For std::pair, std::move.
#include "webrtc/api/ortc/ortcfactoryinterface.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/fakenetwork.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/virtualsocketserver.h"
#include "webrtc/ortc/testrtpparameters.h"
#include "webrtc/p2p/base/udptransport.h"
#include "webrtc/pc/test/fakeaudiocapturemodule.h"
#include "webrtc/pc/test/fakeperiodicvideocapturer.h"
#include "webrtc/pc/test/fakevideotrackrenderer.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/fakenetwork.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
namespace {
diff --git a/webrtc/ortc/ortcfactory_unittest.cc b/webrtc/ortc/ortcfactory_unittest.cc
index da1758b..d964383 100644
--- a/webrtc/ortc/ortcfactory_unittest.cc
+++ b/webrtc/ortc/ortcfactory_unittest.cc
@@ -10,13 +10,13 @@
#include <memory>
-#include "webrtc/base/fakenetwork.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/virtualsocketserver.h"
#include "webrtc/media/base/fakemediaengine.h"
#include "webrtc/ortc/ortcfactory.h"
#include "webrtc/ortc/testrtpparameters.h"
#include "webrtc/p2p/base/fakepackettransport.h"
+#include "webrtc/rtc_base/fakenetwork.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
namespace webrtc {
diff --git a/webrtc/ortc/ortcrtpreceiver_unittest.cc b/webrtc/ortc/ortcrtpreceiver_unittest.cc
index aa7d81d..8273be5 100644
--- a/webrtc/ortc/ortcrtpreceiver_unittest.cc
+++ b/webrtc/ortc/ortcrtpreceiver_unittest.cc
@@ -10,12 +10,12 @@
#include <memory>
-#include "webrtc/base/gunit.h"
#include "webrtc/media/base/fakemediaengine.h"
#include "webrtc/ortc/ortcfactory.h"
#include "webrtc/ortc/testrtpparameters.h"
#include "webrtc/p2p/base/fakepackettransport.h"
#include "webrtc/pc/test/fakevideotracksource.h"
+#include "webrtc/rtc_base/gunit.h"
namespace webrtc {
diff --git a/webrtc/ortc/ortcrtpreceiveradapter.cc b/webrtc/ortc/ortcrtpreceiveradapter.cc
index aefa4d3..4e8c89b3 100644
--- a/webrtc/ortc/ortcrtpreceiveradapter.cc
+++ b/webrtc/ortc/ortcrtpreceiveradapter.cc
@@ -12,10 +12,10 @@
#include <utility>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h" // For "CreateRandomX".
#include "webrtc/media/base/mediaconstants.h"
#include "webrtc/ortc/rtptransportadapter.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h" // For "CreateRandomX".
namespace {
diff --git a/webrtc/ortc/ortcrtpreceiveradapter.h b/webrtc/ortc/ortcrtpreceiveradapter.h
index 8e081e7..2fb793f 100644
--- a/webrtc/ortc/ortcrtpreceiveradapter.h
+++ b/webrtc/ortc/ortcrtpreceiveradapter.h
@@ -16,11 +16,11 @@
#include "webrtc/api/ortc/ortcrtpreceiverinterface.h"
#include "webrtc/api/rtcerror.h"
#include "webrtc/api/rtpparameters.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread.h"
#include "webrtc/ortc/rtptransportcontrolleradapter.h"
#include "webrtc/pc/rtpreceiver.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/thread.h"
namespace webrtc {
diff --git a/webrtc/ortc/ortcrtpsender_unittest.cc b/webrtc/ortc/ortcrtpsender_unittest.cc
index 47cb337..ab8d821 100644
--- a/webrtc/ortc/ortcrtpsender_unittest.cc
+++ b/webrtc/ortc/ortcrtpsender_unittest.cc
@@ -10,12 +10,12 @@
#include <memory>
-#include "webrtc/base/gunit.h"
#include "webrtc/media/base/fakemediaengine.h"
#include "webrtc/ortc/ortcfactory.h"
#include "webrtc/ortc/testrtpparameters.h"
#include "webrtc/p2p/base/fakepackettransport.h"
#include "webrtc/pc/test/fakevideotracksource.h"
+#include "webrtc/rtc_base/gunit.h"
namespace webrtc {
diff --git a/webrtc/ortc/ortcrtpsenderadapter.cc b/webrtc/ortc/ortcrtpsenderadapter.cc
index be2b65d..0bce591 100644
--- a/webrtc/ortc/ortcrtpsenderadapter.cc
+++ b/webrtc/ortc/ortcrtpsenderadapter.cc
@@ -12,9 +12,9 @@
#include <utility>
-#include "webrtc/base/checks.h"
#include "webrtc/media/base/mediaconstants.h"
#include "webrtc/ortc/rtptransportadapter.h"
+#include "webrtc/rtc_base/checks.h"
namespace {
diff --git a/webrtc/ortc/ortcrtpsenderadapter.h b/webrtc/ortc/ortcrtpsenderadapter.h
index 9b60f15..92051e7 100644
--- a/webrtc/ortc/ortcrtpsenderadapter.h
+++ b/webrtc/ortc/ortcrtpsenderadapter.h
@@ -16,10 +16,10 @@
#include "webrtc/api/ortc/ortcrtpsenderinterface.h"
#include "webrtc/api/rtcerror.h"
#include "webrtc/api/rtpparameters.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/sigslot.h"
#include "webrtc/ortc/rtptransportcontrolleradapter.h"
#include "webrtc/pc/rtpsender.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/sigslot.h"
namespace webrtc {
diff --git a/webrtc/ortc/rtpparametersconversion.h b/webrtc/ortc/rtpparametersconversion.h
index d2c9129..fe183da 100644
--- a/webrtc/ortc/rtpparametersconversion.h
+++ b/webrtc/ortc/rtpparametersconversion.h
@@ -16,9 +16,9 @@
#include "webrtc/api/rtcerror.h"
#include "webrtc/api/rtpparameters.h"
-#include "webrtc/base/optional.h"
#include "webrtc/media/base/codec.h"
#include "webrtc/pc/mediasession.h"
+#include "webrtc/rtc_base/optional.h"
namespace webrtc {
diff --git a/webrtc/ortc/rtpparametersconversion_unittest.cc b/webrtc/ortc/rtpparametersconversion_unittest.cc
index 3268406..f6e48a9 100644
--- a/webrtc/ortc/rtpparametersconversion_unittest.cc
+++ b/webrtc/ortc/rtpparametersconversion_unittest.cc
@@ -10,9 +10,9 @@
#include <algorithm>
-#include "webrtc/base/gunit.h"
#include "webrtc/ortc/rtpparametersconversion.h"
#include "webrtc/ortc/testrtpparameters.h"
+#include "webrtc/rtc_base/gunit.h"
namespace webrtc {
diff --git a/webrtc/ortc/rtptransport_unittest.cc b/webrtc/ortc/rtptransport_unittest.cc
index 6d16230..2fc1b23 100644
--- a/webrtc/ortc/rtptransport_unittest.cc
+++ b/webrtc/ortc/rtptransport_unittest.cc
@@ -10,11 +10,11 @@
#include <memory>
-#include "webrtc/base/gunit.h"
#include "webrtc/media/base/fakemediaengine.h"
#include "webrtc/ortc/ortcfactory.h"
#include "webrtc/ortc/testrtpparameters.h"
#include "webrtc/p2p/base/fakepackettransport.h"
+#include "webrtc/rtc_base/gunit.h"
namespace webrtc {
diff --git a/webrtc/ortc/rtptransportadapter.cc b/webrtc/ortc/rtptransportadapter.cc
index 3982f2d..1154ff6 100644
--- a/webrtc/ortc/rtptransportadapter.cc
+++ b/webrtc/ortc/rtptransportadapter.cc
@@ -16,7 +16,7 @@
#include <utility> // For std::move.
#include "webrtc/api/proxy.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
namespace webrtc {
diff --git a/webrtc/ortc/rtptransportadapter.h b/webrtc/ortc/rtptransportadapter.h
index 59a123e..6fbc162 100644
--- a/webrtc/ortc/rtptransportadapter.h
+++ b/webrtc/ortc/rtptransportadapter.h
@@ -16,11 +16,11 @@
#include "webrtc/api/ortc/srtptransportinterface.h"
#include "webrtc/api/rtcerror.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/sigslot.h"
#include "webrtc/media/base/streamparams.h"
#include "webrtc/ortc/rtptransportcontrolleradapter.h"
#include "webrtc/pc/channel.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/sigslot.h"
namespace webrtc {
diff --git a/webrtc/ortc/rtptransportcontroller_unittest.cc b/webrtc/ortc/rtptransportcontroller_unittest.cc
index 40e9851..56bf8a6 100644
--- a/webrtc/ortc/rtptransportcontroller_unittest.cc
+++ b/webrtc/ortc/rtptransportcontroller_unittest.cc
@@ -10,11 +10,11 @@
#include <memory>
-#include "webrtc/base/gunit.h"
#include "webrtc/media/base/fakemediaengine.h"
#include "webrtc/ortc/ortcfactory.h"
#include "webrtc/ortc/testrtpparameters.h"
#include "webrtc/p2p/base/fakepackettransport.h"
+#include "webrtc/rtc_base/gunit.h"
namespace webrtc {
diff --git a/webrtc/ortc/rtptransportcontrolleradapter.cc b/webrtc/ortc/rtptransportcontrolleradapter.cc
index b482e47..5e0b621 100644
--- a/webrtc/ortc/rtptransportcontrolleradapter.cc
+++ b/webrtc/ortc/rtptransportcontrolleradapter.cc
@@ -17,12 +17,12 @@
#include <utility> // For std::move.
#include "webrtc/api/proxy.h"
-#include "webrtc/base/checks.h"
#include "webrtc/media/base/mediaconstants.h"
#include "webrtc/ortc/ortcrtpreceiveradapter.h"
#include "webrtc/ortc/ortcrtpsenderadapter.h"
#include "webrtc/ortc/rtpparametersconversion.h"
#include "webrtc/ortc/rtptransportadapter.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
diff --git a/webrtc/ortc/rtptransportcontrolleradapter.h b/webrtc/ortc/rtptransportcontrolleradapter.h
index 8601dfd..9728c39 100644
--- a/webrtc/ortc/rtptransportcontrolleradapter.h
+++ b/webrtc/ortc/rtptransportcontrolleradapter.h
@@ -20,13 +20,13 @@
#include "webrtc/api/ortc/ortcrtpsenderinterface.h"
#include "webrtc/api/ortc/rtptransportcontrollerinterface.h"
#include "webrtc/api/ortc/srtptransportinterface.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread.h"
#include "webrtc/call/call.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
#include "webrtc/media/base/mediachannel.h" // For MediaConfig.
#include "webrtc/pc/channelmanager.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/thread.h"
namespace webrtc {
diff --git a/webrtc/ortc/srtptransport_unittest.cc b/webrtc/ortc/srtptransport_unittest.cc
index 1287a02..69d8a29 100644
--- a/webrtc/ortc/srtptransport_unittest.cc
+++ b/webrtc/ortc/srtptransport_unittest.cc
@@ -10,11 +10,11 @@
#include <memory>
-#include "webrtc/base/gunit.h"
#include "webrtc/media/base/fakemediaengine.h"
#include "webrtc/ortc/ortcfactory.h"
#include "webrtc/ortc/testrtpparameters.h"
#include "webrtc/p2p/base/fakepackettransport.h"
+#include "webrtc/rtc_base/gunit.h"
namespace webrtc {
diff --git a/webrtc/p2p/base/asyncstuntcpsocket.cc b/webrtc/p2p/base/asyncstuntcpsocket.cc
index 3369bc8..38dd65b 100644
--- a/webrtc/p2p/base/asyncstuntcpsocket.cc
+++ b/webrtc/p2p/base/asyncstuntcpsocket.cc
@@ -13,8 +13,8 @@
#include <string.h>
#include "webrtc/p2p/base/stun.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
namespace cricket {
diff --git a/webrtc/p2p/base/asyncstuntcpsocket.h b/webrtc/p2p/base/asyncstuntcpsocket.h
index 065b4c2..b578f31 100644
--- a/webrtc/p2p/base/asyncstuntcpsocket.h
+++ b/webrtc/p2p/base/asyncstuntcpsocket.h
@@ -11,9 +11,9 @@
#ifndef WEBRTC_P2P_BASE_ASYNCSTUNTCPSOCKET_H_
#define WEBRTC_P2P_BASE_ASYNCSTUNTCPSOCKET_H_
-#include "webrtc/base/asynctcpsocket.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/socketfactory.h"
+#include "webrtc/rtc_base/asynctcpsocket.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/socketfactory.h"
namespace cricket {
diff --git a/webrtc/p2p/base/asyncstuntcpsocket_unittest.cc b/webrtc/p2p/base/asyncstuntcpsocket_unittest.cc
index 61e1411..5dd9661 100644
--- a/webrtc/p2p/base/asyncstuntcpsocket_unittest.cc
+++ b/webrtc/p2p/base/asyncstuntcpsocket_unittest.cc
@@ -11,9 +11,9 @@
#include <memory>
#include "webrtc/p2p/base/asyncstuntcpsocket.h"
-#include "webrtc/base/asyncsocket.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/virtualsocketserver.h"
+#include "webrtc/rtc_base/asyncsocket.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
namespace cricket {
diff --git a/webrtc/p2p/base/basicpacketsocketfactory.cc b/webrtc/p2p/base/basicpacketsocketfactory.cc
index b78a054..e911f2f 100644
--- a/webrtc/p2p/base/basicpacketsocketfactory.cc
+++ b/webrtc/p2p/base/basicpacketsocketfactory.cc
@@ -14,15 +14,15 @@
#include "webrtc/p2p/base/asyncstuntcpsocket.h"
#include "webrtc/p2p/base/stun.h"
-#include "webrtc/base/asynctcpsocket.h"
-#include "webrtc/base/asyncudpsocket.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/nethelpers.h"
-#include "webrtc/base/physicalsocketserver.h"
-#include "webrtc/base/socketadapters.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/asynctcpsocket.h"
+#include "webrtc/rtc_base/asyncudpsocket.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/nethelpers.h"
+#include "webrtc/rtc_base/physicalsocketserver.h"
+#include "webrtc/rtc_base/socketadapters.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/thread.h"
namespace rtc {
diff --git a/webrtc/p2p/base/candidate.h b/webrtc/p2p/base/candidate.h
index 723dbc9..474d7fb 100644
--- a/webrtc/p2p/base/candidate.h
+++ b/webrtc/p2p/base/candidate.h
@@ -21,10 +21,10 @@
#include <string>
#include "webrtc/p2p/base/p2pconstants.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/socketaddress.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/network.h"
+#include "webrtc/rtc_base/socketaddress.h"
namespace cricket {
diff --git a/webrtc/p2p/base/common.h b/webrtc/p2p/base/common.h
index 8a3178c..5dbe491 100644
--- a/webrtc/p2p/base/common.h
+++ b/webrtc/p2p/base/common.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_P2P_BASE_COMMON_H_
#define WEBRTC_P2P_BASE_COMMON_H_
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
// Common log description format for jingle messages
#define LOG_J(sev, obj) LOG(sev) << "Jingle:" << obj->ToString() << ": "
diff --git a/webrtc/p2p/base/dtlstransportchannel.cc b/webrtc/p2p/base/dtlstransportchannel.cc
index f5d6583..4249ae7 100644
--- a/webrtc/p2p/base/dtlstransportchannel.cc
+++ b/webrtc/p2p/base/dtlstransportchannel.cc
@@ -15,13 +15,13 @@
#include "webrtc/p2p/base/common.h"
#include "webrtc/p2p/base/packettransportinternal.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/dscp.h"
-#include "webrtc/base/messagequeue.h"
-#include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/base/stream.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/dscp.h"
+#include "webrtc/rtc_base/messagequeue.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
+#include "webrtc/rtc_base/stream.h"
+#include "webrtc/rtc_base/thread.h"
namespace cricket {
diff --git a/webrtc/p2p/base/dtlstransportchannel.h b/webrtc/p2p/base/dtlstransportchannel.h
index 30a7186..12b94ce 100644
--- a/webrtc/p2p/base/dtlstransportchannel.h
+++ b/webrtc/p2p/base/dtlstransportchannel.h
@@ -15,13 +15,13 @@
#include <string>
#include <vector>
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/bufferqueue.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/base/stream.h"
#include "webrtc/p2p/base/dtlstransportinternal.h"
#include "webrtc/p2p/base/icetransportinternal.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/bufferqueue.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
+#include "webrtc/rtc_base/stream.h"
namespace rtc {
class PacketTransportInternal;
diff --git a/webrtc/p2p/base/dtlstransportchannel_unittest.cc b/webrtc/p2p/base/dtlstransportchannel_unittest.cc
index 4286d76..225d6f7 100644
--- a/webrtc/p2p/base/dtlstransportchannel_unittest.cc
+++ b/webrtc/p2p/base/dtlstransportchannel_unittest.cc
@@ -14,14 +14,14 @@
#include "webrtc/p2p/base/dtlstransportchannel.h"
#include "webrtc/p2p/base/fakeicetransport.h"
#include "webrtc/p2p/base/packettransportinternal.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/dscp.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/sslidentity.h"
-#include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/base/stringutils.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/dscp.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/sslidentity.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
+#include "webrtc/rtc_base/stringutils.h"
#define MAYBE_SKIP_TEST(feature) \
if (!(rtc::SSLStreamAdapter::feature())) { \
diff --git a/webrtc/p2p/base/dtlstransportinternal.h b/webrtc/p2p/base/dtlstransportinternal.h
index 448dd49..b77ae07 100644
--- a/webrtc/p2p/base/dtlstransportinternal.h
+++ b/webrtc/p2p/base/dtlstransportinternal.h
@@ -15,11 +15,11 @@
#include <string>
#include <vector>
-#include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/base/stringencode.h"
#include "webrtc/p2p/base/icetransportinternal.h"
#include "webrtc/p2p/base/jseptransport.h"
#include "webrtc/p2p/base/packettransportinternal.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
+#include "webrtc/rtc_base/stringencode.h"
namespace cricket {
diff --git a/webrtc/p2p/base/fakedtlstransport.h b/webrtc/p2p/base/fakedtlstransport.h
index 0384f00..e78c7fc 100644
--- a/webrtc/p2p/base/fakedtlstransport.h
+++ b/webrtc/p2p/base/fakedtlstransport.h
@@ -15,9 +15,9 @@
#include <string>
#include <vector>
-#include "webrtc/base/fakesslidentity.h"
#include "webrtc/p2p/base/dtlstransportinternal.h"
#include "webrtc/p2p/base/fakeicetransport.h"
+#include "webrtc/rtc_base/fakesslidentity.h"
namespace cricket {
diff --git a/webrtc/p2p/base/fakeicetransport.h b/webrtc/p2p/base/fakeicetransport.h
index 2b0662f..d9c8485 100644
--- a/webrtc/p2p/base/fakeicetransport.h
+++ b/webrtc/p2p/base/fakeicetransport.h
@@ -13,9 +13,9 @@
#include <string>
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/copyonwritebuffer.h"
#include "webrtc/p2p/base/icetransportinternal.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
namespace cricket {
diff --git a/webrtc/p2p/base/fakepackettransport.h b/webrtc/p2p/base/fakepackettransport.h
index 64e0f7d..16af9a4 100644
--- a/webrtc/p2p/base/fakepackettransport.h
+++ b/webrtc/p2p/base/fakepackettransport.h
@@ -14,9 +14,9 @@
#include <string>
#include "webrtc/api/ortc/packettransportinterface.h"
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/copyonwritebuffer.h"
#include "webrtc/p2p/base/packettransportinternal.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
namespace rtc {
diff --git a/webrtc/p2p/base/fakeportallocator.h b/webrtc/p2p/base/fakeportallocator.h
index a1dbbf8..7bf7f96 100644
--- a/webrtc/p2p/base/fakeportallocator.h
+++ b/webrtc/p2p/base/fakeportallocator.h
@@ -15,10 +15,10 @@
#include <string>
#include <vector>
-#include "webrtc/base/nethelpers.h"
#include "webrtc/p2p/base/basicpacketsocketfactory.h"
#include "webrtc/p2p/base/portallocator.h"
#include "webrtc/p2p/base/udpport.h"
+#include "webrtc/rtc_base/nethelpers.h"
namespace rtc {
class SocketFactory;
diff --git a/webrtc/p2p/base/faketransportcontroller.h b/webrtc/p2p/base/faketransportcontroller.h
index 9a696bc..0c78475 100644
--- a/webrtc/p2p/base/faketransportcontroller.h
+++ b/webrtc/p2p/base/faketransportcontroller.h
@@ -15,12 +15,12 @@
#include <string>
#include <vector>
-#include "webrtc/base/bind.h"
-#include "webrtc/base/sslfingerprint.h"
-#include "webrtc/base/thread.h"
#include "webrtc/p2p/base/fakedtlstransport.h"
#include "webrtc/p2p/base/fakeicetransport.h"
#include "webrtc/p2p/base/transportcontroller.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/sslfingerprint.h"
+#include "webrtc/rtc_base/thread.h"
namespace cricket {
diff --git a/webrtc/p2p/base/icetransportinternal.h b/webrtc/p2p/base/icetransportinternal.h
index e9b40dc..435a081 100644
--- a/webrtc/p2p/base/icetransportinternal.h
+++ b/webrtc/p2p/base/icetransportinternal.h
@@ -13,12 +13,12 @@
#include <string>
-#include "webrtc/base/stringencode.h"
#include "webrtc/p2p/base/candidate.h"
#include "webrtc/p2p/base/candidatepairinterface.h"
#include "webrtc/p2p/base/jseptransport.h"
#include "webrtc/p2p/base/packettransportinternal.h"
#include "webrtc/p2p/base/transportdescription.h"
+#include "webrtc/rtc_base/stringencode.h"
namespace webrtc {
class MetricsObserverInterface;
diff --git a/webrtc/p2p/base/jseptransport.cc b/webrtc/p2p/base/jseptransport.cc
index 301ae24..a8f4564 100644
--- a/webrtc/p2p/base/jseptransport.cc
+++ b/webrtc/p2p/base/jseptransport.cc
@@ -13,14 +13,14 @@
#include <memory>
#include <utility> // for std::pair
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
#include "webrtc/p2p/base/candidate.h"
#include "webrtc/p2p/base/dtlstransportchannel.h"
#include "webrtc/p2p/base/p2pconstants.h"
#include "webrtc/p2p/base/p2ptransportchannel.h"
#include "webrtc/p2p/base/port.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
namespace cricket {
diff --git a/webrtc/p2p/base/jseptransport.h b/webrtc/p2p/base/jseptransport.h
index 7b81be0..9353cd7 100644
--- a/webrtc/p2p/base/jseptransport.h
+++ b/webrtc/p2p/base/jseptransport.h
@@ -16,16 +16,16 @@
#include <string>
#include <vector>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/messagequeue.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/rtccertificate.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/sslstreamadapter.h"
#include "webrtc/p2p/base/candidate.h"
#include "webrtc/p2p/base/p2pconstants.h"
#include "webrtc/p2p/base/sessiondescription.h"
#include "webrtc/p2p/base/transportinfo.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/messagequeue.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/rtccertificate.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
namespace cricket {
diff --git a/webrtc/p2p/base/jseptransport_unittest.cc b/webrtc/p2p/base/jseptransport_unittest.cc
index 23ed4d8..56b61ec 100644
--- a/webrtc/p2p/base/jseptransport_unittest.cc
+++ b/webrtc/p2p/base/jseptransport_unittest.cc
@@ -10,11 +10,11 @@
#include <memory>
-#include "webrtc/base/fakesslidentity.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/network.h"
#include "webrtc/p2p/base/fakedtlstransport.h"
#include "webrtc/p2p/base/fakeicetransport.h"
+#include "webrtc/rtc_base/fakesslidentity.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/network.h"
using cricket::JsepTransport;
using cricket::TransportChannel;
diff --git a/webrtc/p2p/base/mockicetransport.h b/webrtc/p2p/base/mockicetransport.h
index 53549ab..92d0373 100644
--- a/webrtc/p2p/base/mockicetransport.h
+++ b/webrtc/p2p/base/mockicetransport.h
@@ -15,8 +15,8 @@
#include <string>
#include <vector>
-#include "webrtc/base/gunit.h"
#include "webrtc/p2p/base/icetransportinternal.h"
+#include "webrtc/rtc_base/gunit.h"
#include "webrtc/test/gmock.h"
using testing::_;
diff --git a/webrtc/p2p/base/p2ptransportchannel.cc b/webrtc/p2p/base/p2ptransportchannel.cc
index 8853cca..78b4c93 100644
--- a/webrtc/p2p/base/p2ptransportchannel.cc
+++ b/webrtc/p2p/base/p2ptransportchannel.cc
@@ -15,15 +15,15 @@
#include <set>
#include "webrtc/api/umametrics.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/crc32.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/stringencode.h"
#include "webrtc/p2p/base/candidate.h"
#include "webrtc/p2p/base/candidatepairinterface.h"
#include "webrtc/p2p/base/common.h"
#include "webrtc/p2p/base/relayport.h" // For RELAY_PORT_TYPE.
#include "webrtc/p2p/base/stunport.h" // For STUN_PORT_TYPE.
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/crc32.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/stringencode.h"
#include "webrtc/system_wrappers/include/field_trial.h"
namespace {
diff --git a/webrtc/p2p/base/p2ptransportchannel.h b/webrtc/p2p/base/p2ptransportchannel.h
index a535edd..beca558 100644
--- a/webrtc/p2p/base/p2ptransportchannel.h
+++ b/webrtc/p2p/base/p2ptransportchannel.h
@@ -26,14 +26,14 @@
#include <string>
#include <vector>
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/sigslot.h"
#include "webrtc/p2p/base/candidate.h"
#include "webrtc/p2p/base/candidatepairinterface.h"
#include "webrtc/p2p/base/icetransportinternal.h"
#include "webrtc/p2p/base/portallocator.h"
#include "webrtc/p2p/base/portinterface.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/sigslot.h"
namespace cricket {
diff --git a/webrtc/p2p/base/p2ptransportchannel_unittest.cc b/webrtc/p2p/base/p2ptransportchannel_unittest.cc
index b829a59..7b3fa6a 100644
--- a/webrtc/p2p/base/p2ptransportchannel_unittest.cc
+++ b/webrtc/p2p/base/p2ptransportchannel_unittest.cc
@@ -12,22 +12,6 @@
#include <memory>
#include "webrtc/api/fakemetricsobserver.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/dscp.h"
-#include "webrtc/base/fakeclock.h"
-#include "webrtc/base/fakenetwork.h"
-#include "webrtc/base/firewallsocketserver.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/natserver.h"
-#include "webrtc/base/natsocketfactory.h"
-#include "webrtc/base/proxyserver.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
#include "webrtc/p2p/base/fakeportallocator.h"
#include "webrtc/p2p/base/icetransportinternal.h"
#include "webrtc/p2p/base/p2ptransportchannel.h"
@@ -36,6 +20,22 @@
#include "webrtc/p2p/base/teststunserver.h"
#include "webrtc/p2p/base/testturnserver.h"
#include "webrtc/p2p/client/basicportallocator.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/dscp.h"
+#include "webrtc/rtc_base/fakeclock.h"
+#include "webrtc/rtc_base/fakenetwork.h"
+#include "webrtc/rtc_base/firewallsocketserver.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/natserver.h"
+#include "webrtc/rtc_base/natsocketfactory.h"
+#include "webrtc/rtc_base/proxyserver.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
namespace {
diff --git a/webrtc/p2p/base/packetlossestimator.cc b/webrtc/p2p/base/packetlossestimator.cc
index 7dcd5b9..7990119 100644
--- a/webrtc/p2p/base/packetlossestimator.cc
+++ b/webrtc/p2p/base/packetlossestimator.cc
@@ -12,7 +12,7 @@
#include "webrtc/p2p/base/packetlossestimator.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace cricket {
diff --git a/webrtc/p2p/base/packetlossestimator_unittest.cc b/webrtc/p2p/base/packetlossestimator_unittest.cc
index 44cfdbf..642dcc2 100644
--- a/webrtc/p2p/base/packetlossestimator_unittest.cc
+++ b/webrtc/p2p/base/packetlossestimator_unittest.cc
@@ -10,8 +10,8 @@
#include <utility>
-#include "webrtc/base/gunit.h"
#include "webrtc/p2p/base/packetlossestimator.h"
+#include "webrtc/rtc_base/gunit.h"
using cricket::PacketLossEstimator;
diff --git a/webrtc/p2p/base/packetsocketfactory.h b/webrtc/p2p/base/packetsocketfactory.h
index c3b2417..60f0ae0 100644
--- a/webrtc/p2p/base/packetsocketfactory.h
+++ b/webrtc/p2p/base/packetsocketfactory.h
@@ -11,8 +11,8 @@
#ifndef WEBRTC_P2P_BASE_PACKETSOCKETFACTORY_H_
#define WEBRTC_P2P_BASE_PACKETSOCKETFACTORY_H_
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/proxyinfo.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/proxyinfo.h"
namespace rtc {
diff --git a/webrtc/p2p/base/packettransportinternal.h b/webrtc/p2p/base/packettransportinternal.h
index 8e32f72..3dc27d5 100644
--- a/webrtc/p2p/base/packettransportinternal.h
+++ b/webrtc/p2p/base/packettransportinternal.h
@@ -16,9 +16,9 @@
// This is included for PacketOptions.
#include "webrtc/api/ortc/packettransportinterface.h"
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/socket.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/socket.h"
namespace cricket {
class TransportChannel;
diff --git a/webrtc/p2p/base/port.cc b/webrtc/p2p/base/port.cc
index 3a3d9ea..a101633 100644
--- a/webrtc/p2p/base/port.cc
+++ b/webrtc/p2p/base/port.cc
@@ -13,19 +13,19 @@
#include <algorithm>
#include <vector>
-#include "webrtc/base/base64.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/crc32.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/messagedigest.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/safe_minmax.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/stringutils.h"
#include "webrtc/p2p/base/common.h"
#include "webrtc/p2p/base/portallocator.h"
+#include "webrtc/rtc_base/base64.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/crc32.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/messagedigest.h"
+#include "webrtc/rtc_base/network.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/safe_minmax.h"
+#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/rtc_base/stringutils.h"
namespace {
diff --git a/webrtc/p2p/base/port.h b/webrtc/p2p/base/port.h
index fd6d182..5764738 100644
--- a/webrtc/p2p/base/port.h
+++ b/webrtc/p2p/base/port.h
@@ -17,15 +17,6 @@
#include <string>
#include <vector>
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/proxyinfo.h"
-#include "webrtc/base/ratetracker.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/thread.h"
#include "webrtc/p2p/base/candidate.h"
#include "webrtc/p2p/base/candidatepairinterface.h"
#include "webrtc/p2p/base/jseptransport.h"
@@ -34,6 +25,15 @@
#include "webrtc/p2p/base/portinterface.h"
#include "webrtc/p2p/base/stun.h"
#include "webrtc/p2p/base/stunrequest.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/network.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/proxyinfo.h"
+#include "webrtc/rtc_base/ratetracker.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/thread.h"
namespace cricket {
diff --git a/webrtc/p2p/base/port_unittest.cc b/webrtc/p2p/base/port_unittest.cc
index a95bc2b..eb54760 100644
--- a/webrtc/p2p/base/port_unittest.cc
+++ b/webrtc/p2p/base/port_unittest.cc
@@ -10,20 +10,6 @@
#include <memory>
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/crc32.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/natserver.h"
-#include "webrtc/base/natsocketfactory.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
#include "webrtc/p2p/base/basicpacketsocketfactory.h"
#include "webrtc/p2p/base/jseptransport.h"
#include "webrtc/p2p/base/relayport.h"
@@ -33,6 +19,20 @@
#include "webrtc/p2p/base/teststunserver.h"
#include "webrtc/p2p/base/testturnserver.h"
#include "webrtc/p2p/base/turnport.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/crc32.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/natserver.h"
+#include "webrtc/rtc_base/natsocketfactory.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
using rtc::AsyncPacketSocket;
using rtc::Buffer;
diff --git a/webrtc/p2p/base/portallocator.cc b/webrtc/p2p/base/portallocator.cc
index a587aa8..dd776e7 100644
--- a/webrtc/p2p/base/portallocator.cc
+++ b/webrtc/p2p/base/portallocator.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/base/checks.h"
#include "webrtc/p2p/base/portallocator.h"
+#include "webrtc/rtc_base/checks.h"
namespace cricket {
diff --git a/webrtc/p2p/base/portallocator.h b/webrtc/p2p/base/portallocator.h
index dfbed3d..74b67af 100644
--- a/webrtc/p2p/base/portallocator.h
+++ b/webrtc/p2p/base/portallocator.h
@@ -18,10 +18,10 @@
#include "webrtc/p2p/base/port.h"
#include "webrtc/p2p/base/portinterface.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/proxyinfo.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/proxyinfo.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/thread.h"
namespace webrtc {
class MetricsObserverInterface;
diff --git a/webrtc/p2p/base/portallocator_unittest.cc b/webrtc/p2p/base/portallocator_unittest.cc
index 3794214..4845f7c 100644
--- a/webrtc/p2p/base/portallocator_unittest.cc
+++ b/webrtc/p2p/base/portallocator_unittest.cc
@@ -10,11 +10,11 @@
#include <memory>
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
#include "webrtc/p2p/base/fakeportallocator.h"
#include "webrtc/p2p/base/portallocator.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
static const char kContentName[] = "test content";
// Based on ICE_UFRAG_LENGTH
diff --git a/webrtc/p2p/base/portinterface.h b/webrtc/p2p/base/portinterface.h
index 4a6e900..7cb8429 100644
--- a/webrtc/p2p/base/portinterface.h
+++ b/webrtc/p2p/base/portinterface.h
@@ -13,9 +13,9 @@
#include <string>
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/socketaddress.h"
#include "webrtc/p2p/base/jseptransport.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/socketaddress.h"
namespace rtc {
class Network;
diff --git a/webrtc/p2p/base/pseudotcp.cc b/webrtc/p2p/base/pseudotcp.cc
index d93f49e..55935e3 100644
--- a/webrtc/p2p/base/pseudotcp.cc
+++ b/webrtc/p2p/base/pseudotcp.cc
@@ -17,16 +17,16 @@
#include <memory>
#include <set>
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/safe_minmax.h"
-#include "webrtc/base/socket.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/safe_minmax.h"
+#include "webrtc/rtc_base/socket.h"
+#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/rtc_base/timeutils.h"
// The following logging is for detailed (packet-level) analysis only.
#define _DBG_NONE 0
diff --git a/webrtc/p2p/base/pseudotcp.h b/webrtc/p2p/base/pseudotcp.h
index 6d402da..134bc00 100644
--- a/webrtc/p2p/base/pseudotcp.h
+++ b/webrtc/p2p/base/pseudotcp.h
@@ -13,8 +13,8 @@
#include <list>
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/stream.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/stream.h"
namespace cricket {
diff --git a/webrtc/p2p/base/pseudotcp_unittest.cc b/webrtc/p2p/base/pseudotcp_unittest.cc
index 8fb5b38b..157f456 100644
--- a/webrtc/p2p/base/pseudotcp_unittest.cc
+++ b/webrtc/p2p/base/pseudotcp_unittest.cc
@@ -12,12 +12,12 @@
#include <vector>
#include "webrtc/p2p/base/pseudotcp.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/messagehandler.h"
-#include "webrtc/base/stream.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/messagehandler.h"
+#include "webrtc/rtc_base/stream.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/timeutils.h"
using cricket::PseudoTcp;
diff --git a/webrtc/p2p/base/relayport.cc b/webrtc/p2p/base/relayport.cc
index e353511..efb9670 100644
--- a/webrtc/p2p/base/relayport.cc
+++ b/webrtc/p2p/base/relayport.cc
@@ -10,10 +10,10 @@
#include <algorithm>
#include "webrtc/p2p/base/relayport.h"
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
namespace cricket {
diff --git a/webrtc/p2p/base/relayport_unittest.cc b/webrtc/p2p/base/relayport_unittest.cc
index 6b91baf..e1bed76 100644
--- a/webrtc/p2p/base/relayport_unittest.cc
+++ b/webrtc/p2p/base/relayport_unittest.cc
@@ -13,14 +13,14 @@
#include "webrtc/p2p/base/basicpacketsocketfactory.h"
#include "webrtc/p2p/base/relayport.h"
#include "webrtc/p2p/base/relayserver.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/socketadapters.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/socketadapters.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
using rtc::SocketAddress;
diff --git a/webrtc/p2p/base/relayserver.cc b/webrtc/p2p/base/relayserver.cc
index d080d90..3a97d4e 100644
--- a/webrtc/p2p/base/relayserver.cc
+++ b/webrtc/p2p/base/relayserver.cc
@@ -16,11 +16,11 @@
#include <algorithm>
-#include "webrtc/base/asynctcpsocket.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/socketadapters.h"
+#include "webrtc/rtc_base/asynctcpsocket.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/socketadapters.h"
namespace cricket {
diff --git a/webrtc/p2p/base/relayserver.h b/webrtc/p2p/base/relayserver.h
index c60e271..579b014 100644
--- a/webrtc/p2p/base/relayserver.h
+++ b/webrtc/p2p/base/relayserver.h
@@ -17,10 +17,10 @@
#include "webrtc/p2p/base/port.h"
#include "webrtc/p2p/base/stun.h"
-#include "webrtc/base/asyncudpsocket.h"
-#include "webrtc/base/socketaddresspair.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/asyncudpsocket.h"
+#include "webrtc/rtc_base/socketaddresspair.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/timeutils.h"
namespace cricket {
diff --git a/webrtc/p2p/base/relayserver_unittest.cc b/webrtc/p2p/base/relayserver_unittest.cc
index f27f438..7c1b29e 100644
--- a/webrtc/p2p/base/relayserver_unittest.cc
+++ b/webrtc/p2p/base/relayserver_unittest.cc
@@ -11,16 +11,16 @@
#include <memory>
#include <string>
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/testclient.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
#include "webrtc/p2p/base/relayserver.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/testclient.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
using rtc::SocketAddress;
using namespace cricket;
diff --git a/webrtc/p2p/base/sessiondescription.h b/webrtc/p2p/base/sessiondescription.h
index 5a750ef..df9348d 100644
--- a/webrtc/p2p/base/sessiondescription.h
+++ b/webrtc/p2p/base/sessiondescription.h
@@ -14,8 +14,8 @@
#include <string>
#include <vector>
-#include "webrtc/base/constructormagic.h"
#include "webrtc/p2p/base/transportinfo.h"
+#include "webrtc/rtc_base/constructormagic.h"
namespace cricket {
diff --git a/webrtc/p2p/base/stun.cc b/webrtc/p2p/base/stun.cc
index 8217c02..56b4ee1 100644
--- a/webrtc/p2p/base/stun.cc
+++ b/webrtc/p2p/base/stun.cc
@@ -14,13 +14,13 @@
#include <memory>
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/crc32.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/messagedigest.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/stringencode.h"
+#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/crc32.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/messagedigest.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/stringencode.h"
using rtc::ByteBufferReader;
using rtc::ByteBufferWriter;
diff --git a/webrtc/p2p/base/stun.h b/webrtc/p2p/base/stun.h
index 4ea4505..4a44dcb 100644
--- a/webrtc/p2p/base/stun.h
+++ b/webrtc/p2p/base/stun.h
@@ -17,9 +17,9 @@
#include <string>
#include <vector>
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/socketaddress.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/socketaddress.h"
namespace cricket {
diff --git a/webrtc/p2p/base/stun_unittest.cc b/webrtc/p2p/base/stun_unittest.cc
index 15d4648..ef387a1 100644
--- a/webrtc/p2p/base/stun_unittest.cc
+++ b/webrtc/p2p/base/stun_unittest.cc
@@ -10,14 +10,14 @@
#include <string>
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/messagedigest.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/socketaddress.h"
#include "webrtc/p2p/base/stun.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/messagedigest.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/socketaddress.h"
namespace cricket {
diff --git a/webrtc/p2p/base/stunport.cc b/webrtc/p2p/base/stunport.cc
index 5801ba7..fa7a63c 100644
--- a/webrtc/p2p/base/stunport.cc
+++ b/webrtc/p2p/base/stunport.cc
@@ -13,11 +13,11 @@
#include "webrtc/p2p/base/common.h"
#include "webrtc/p2p/base/portallocator.h"
#include "webrtc/p2p/base/stun.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/ipaddress.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/nethelpers.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/ipaddress.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/nethelpers.h"
namespace cricket {
diff --git a/webrtc/p2p/base/stunport.h b/webrtc/p2p/base/stunport.h
index 1bbe25f..de5127c 100644
--- a/webrtc/p2p/base/stunport.h
+++ b/webrtc/p2p/base/stunport.h
@@ -16,7 +16,7 @@
#include "webrtc/p2p/base/port.h"
#include "webrtc/p2p/base/stunrequest.h"
-#include "webrtc/base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
// TODO(mallinath) - Rename stunport.cc|h to udpport.cc|h.
namespace rtc {
diff --git a/webrtc/p2p/base/stunport_unittest.cc b/webrtc/p2p/base/stunport_unittest.cc
index bf44ffc..25f5a74 100644
--- a/webrtc/p2p/base/stunport_unittest.cc
+++ b/webrtc/p2p/base/stunport_unittest.cc
@@ -13,11 +13,11 @@
#include "webrtc/p2p/base/basicpacketsocketfactory.h"
#include "webrtc/p2p/base/stunport.h"
#include "webrtc/p2p/base/teststunserver.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/virtualsocketserver.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
using cricket::ServerAddresses;
using rtc::SocketAddress;
diff --git a/webrtc/p2p/base/stunrequest.cc b/webrtc/p2p/base/stunrequest.cc
index d3336fa..cace17f 100644
--- a/webrtc/p2p/base/stunrequest.cc
+++ b/webrtc/p2p/base/stunrequest.cc
@@ -13,11 +13,11 @@
#include <algorithm>
#include <memory>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/stringencode.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/stringencode.h"
namespace cricket {
diff --git a/webrtc/p2p/base/stunrequest.h b/webrtc/p2p/base/stunrequest.h
index 99dff14..a1c6930 100644
--- a/webrtc/p2p/base/stunrequest.h
+++ b/webrtc/p2p/base/stunrequest.h
@@ -14,8 +14,8 @@
#include <map>
#include <string>
#include "webrtc/p2p/base/stun.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/thread.h"
namespace cricket {
diff --git a/webrtc/p2p/base/stunrequest_unittest.cc b/webrtc/p2p/base/stunrequest_unittest.cc
index 9b8ccac..a4f603b 100644
--- a/webrtc/p2p/base/stunrequest_unittest.cc
+++ b/webrtc/p2p/base/stunrequest_unittest.cc
@@ -9,12 +9,12 @@
*/
#include "webrtc/p2p/base/stunrequest.h"
-#include "webrtc/base/fakeclock.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/fakeclock.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/timeutils.h"
using namespace cricket;
diff --git a/webrtc/p2p/base/stunserver.cc b/webrtc/p2p/base/stunserver.cc
index 532add7..3a3a0ab 100644
--- a/webrtc/p2p/base/stunserver.cc
+++ b/webrtc/p2p/base/stunserver.cc
@@ -10,8 +10,8 @@
#include "webrtc/p2p/base/stunserver.h"
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/logging.h"
namespace cricket {
diff --git a/webrtc/p2p/base/stunserver.h b/webrtc/p2p/base/stunserver.h
index c9ae86a..92707b0 100644
--- a/webrtc/p2p/base/stunserver.h
+++ b/webrtc/p2p/base/stunserver.h
@@ -14,7 +14,7 @@
#include <memory>
#include "webrtc/p2p/base/stun.h"
-#include "webrtc/base/asyncudpsocket.h"
+#include "webrtc/rtc_base/asyncudpsocket.h"
namespace cricket {
diff --git a/webrtc/p2p/base/stunserver_unittest.cc b/webrtc/p2p/base/stunserver_unittest.cc
index 1e8f8b4..66cb59f 100644
--- a/webrtc/p2p/base/stunserver_unittest.cc
+++ b/webrtc/p2p/base/stunserver_unittest.cc
@@ -11,13 +11,13 @@
#include <memory>
#include <string>
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/testclient.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
#include "webrtc/p2p/base/stunserver.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/testclient.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
using namespace cricket;
diff --git a/webrtc/p2p/base/tcpport.cc b/webrtc/p2p/base/tcpport.cc
index 4fd527e..86670cd 100644
--- a/webrtc/p2p/base/tcpport.cc
+++ b/webrtc/p2p/base/tcpport.cc
@@ -67,8 +67,8 @@
#include "webrtc/p2p/base/tcpport.h"
#include "webrtc/p2p/base/common.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
namespace cricket {
diff --git a/webrtc/p2p/base/tcpport.h b/webrtc/p2p/base/tcpport.h
index ce91e44..0974fa7 100644
--- a/webrtc/p2p/base/tcpport.h
+++ b/webrtc/p2p/base/tcpport.h
@@ -16,7 +16,7 @@
#include <string>
#include "webrtc/p2p/base/port.h"
-#include "webrtc/base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
namespace cricket {
diff --git a/webrtc/p2p/base/tcpport_unittest.cc b/webrtc/p2p/base/tcpport_unittest.cc
index cc3f9ad..0f7bd1f 100644
--- a/webrtc/p2p/base/tcpport_unittest.cc
+++ b/webrtc/p2p/base/tcpport_unittest.cc
@@ -10,11 +10,11 @@
#include <memory>
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
#include "webrtc/p2p/base/basicpacketsocketfactory.h"
#include "webrtc/p2p/base/tcpport.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
using rtc::SocketAddress;
using cricket::Connection;
diff --git a/webrtc/p2p/base/testrelayserver.h b/webrtc/p2p/base/testrelayserver.h
index 7bc0bee..27bc4c1 100644
--- a/webrtc/p2p/base/testrelayserver.h
+++ b/webrtc/p2p/base/testrelayserver.h
@@ -14,10 +14,10 @@
#include <memory>
#include "webrtc/p2p/base/relayserver.h"
-#include "webrtc/base/asynctcpsocket.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/socketadapters.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/asynctcpsocket.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/socketadapters.h"
+#include "webrtc/rtc_base/thread.h"
namespace cricket {
diff --git a/webrtc/p2p/base/teststunserver.h b/webrtc/p2p/base/teststunserver.h
index 1911a0b..1a9e670 100644
--- a/webrtc/p2p/base/teststunserver.h
+++ b/webrtc/p2p/base/teststunserver.h
@@ -12,8 +12,8 @@
#define WEBRTC_P2P_BASE_TESTSTUNSERVER_H_
#include "webrtc/p2p/base/stunserver.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/thread.h"
namespace cricket {
diff --git a/webrtc/p2p/base/testturnserver.h b/webrtc/p2p/base/testturnserver.h
index 9cd8203..5091e8e 100644
--- a/webrtc/p2p/base/testturnserver.h
+++ b/webrtc/p2p/base/testturnserver.h
@@ -17,8 +17,8 @@
#include "webrtc/p2p/base/basicpacketsocketfactory.h"
#include "webrtc/p2p/base/stun.h"
#include "webrtc/p2p/base/turnserver.h"
-#include "webrtc/base/asyncudpsocket.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/asyncudpsocket.h"
+#include "webrtc/rtc_base/thread.h"
namespace cricket {
diff --git a/webrtc/p2p/base/transportchannelimpl.h b/webrtc/p2p/base/transportchannelimpl.h
index f72cb2d..cf6e362 100644
--- a/webrtc/p2p/base/transportchannelimpl.h
+++ b/webrtc/p2p/base/transportchannelimpl.h
@@ -13,9 +13,9 @@
#include <string>
-#include "webrtc/base/constructormagic.h"
#include "webrtc/p2p/base/icetransportinternal.h"
#include "webrtc/p2p/base/transportchannel.h"
+#include "webrtc/rtc_base/constructormagic.h"
namespace webrtc {
class MetricsObserverInterface;
diff --git a/webrtc/p2p/base/transportcontroller.cc b/webrtc/p2p/base/transportcontroller.cc
index db2d8d9..8f6674e 100644
--- a/webrtc/p2p/base/transportcontroller.cc
+++ b/webrtc/p2p/base/transportcontroller.cc
@@ -13,10 +13,10 @@
#include <algorithm>
#include <memory>
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/thread.h"
#include "webrtc/p2p/base/port.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/thread.h"
namespace {
diff --git a/webrtc/p2p/base/transportcontroller.h b/webrtc/p2p/base/transportcontroller.h
index 7cc59e8..f16e893 100644
--- a/webrtc/p2p/base/transportcontroller.h
+++ b/webrtc/p2p/base/transportcontroller.h
@@ -16,15 +16,15 @@
#include <string>
#include <vector>
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/refcountedobject.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/sslstreamadapter.h"
#include "webrtc/p2p/base/candidate.h"
#include "webrtc/p2p/base/dtlstransportchannel.h"
#include "webrtc/p2p/base/jseptransport.h"
#include "webrtc/p2p/base/p2ptransportchannel.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/refcountedobject.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
namespace rtc {
class Thread;
diff --git a/webrtc/p2p/base/transportcontroller_unittest.cc b/webrtc/p2p/base/transportcontroller_unittest.cc
index 239bb2a..8a2d298 100644
--- a/webrtc/p2p/base/transportcontroller_unittest.cc
+++ b/webrtc/p2p/base/transportcontroller_unittest.cc
@@ -11,17 +11,17 @@
#include <map>
#include <memory>
-#include "webrtc/base/fakesslidentity.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/sslidentity.h"
-#include "webrtc/base/thread.h"
#include "webrtc/p2p/base/dtlstransportchannel.h"
#include "webrtc/p2p/base/fakeportallocator.h"
#include "webrtc/p2p/base/faketransportcontroller.h"
#include "webrtc/p2p/base/p2ptransportchannel.h"
#include "webrtc/p2p/base/portallocator.h"
#include "webrtc/p2p/base/transportcontroller.h"
+#include "webrtc/rtc_base/fakesslidentity.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/sslidentity.h"
+#include "webrtc/rtc_base/thread.h"
static const int kTimeout = 100;
static const char kIceUfrag1[] = "TESTICEUFRAG0001";
diff --git a/webrtc/p2p/base/transportdescription.cc b/webrtc/p2p/base/transportdescription.cc
index 4d61edd..7c0f1f5 100644
--- a/webrtc/p2p/base/transportdescription.cc
+++ b/webrtc/p2p/base/transportdescription.cc
@@ -10,9 +10,9 @@
#include "webrtc/p2p/base/transportdescription.h"
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/stringutils.h"
#include "webrtc/p2p/base/p2pconstants.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/stringutils.h"
namespace cricket {
diff --git a/webrtc/p2p/base/transportdescription.h b/webrtc/p2p/base/transportdescription.h
index 22d054d..6702131 100644
--- a/webrtc/p2p/base/transportdescription.h
+++ b/webrtc/p2p/base/transportdescription.h
@@ -17,7 +17,7 @@
#include <vector>
#include "webrtc/p2p/base/p2pconstants.h"
-#include "webrtc/base/sslfingerprint.h"
+#include "webrtc/rtc_base/sslfingerprint.h"
namespace cricket {
diff --git a/webrtc/p2p/base/transportdescriptionfactory.cc b/webrtc/p2p/base/transportdescriptionfactory.cc
index 856ad46..1c75b32 100644
--- a/webrtc/p2p/base/transportdescriptionfactory.cc
+++ b/webrtc/p2p/base/transportdescriptionfactory.cc
@@ -13,10 +13,10 @@
#include <memory>
#include "webrtc/p2p/base/transportdescription.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/messagedigest.h"
-#include "webrtc/base/sslfingerprint.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/messagedigest.h"
+#include "webrtc/rtc_base/sslfingerprint.h"
namespace cricket {
diff --git a/webrtc/p2p/base/transportdescriptionfactory.h b/webrtc/p2p/base/transportdescriptionfactory.h
index ac04f04..b9b3c5b 100644
--- a/webrtc/p2p/base/transportdescriptionfactory.h
+++ b/webrtc/p2p/base/transportdescriptionfactory.h
@@ -11,8 +11,8 @@
#ifndef WEBRTC_P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_
#define WEBRTC_P2P_BASE_TRANSPORTDESCRIPTIONFACTORY_H_
-#include "webrtc/base/rtccertificate.h"
#include "webrtc/p2p/base/transportdescription.h"
+#include "webrtc/rtc_base/rtccertificate.h"
namespace rtc {
class SSLIdentity;
diff --git a/webrtc/p2p/base/transportdescriptionfactory_unittest.cc b/webrtc/p2p/base/transportdescriptionfactory_unittest.cc
index 83bc072..f8f48bc 100644
--- a/webrtc/p2p/base/transportdescriptionfactory_unittest.cc
+++ b/webrtc/p2p/base/transportdescriptionfactory_unittest.cc
@@ -15,9 +15,9 @@
#include "webrtc/p2p/base/p2pconstants.h"
#include "webrtc/p2p/base/transportdescription.h"
#include "webrtc/p2p/base/transportdescriptionfactory.h"
-#include "webrtc/base/fakesslidentity.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/ssladapter.h"
+#include "webrtc/rtc_base/fakesslidentity.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/ssladapter.h"
using cricket::TransportDescriptionFactory;
using cricket::TransportDescription;
diff --git a/webrtc/p2p/base/transportinfo.h b/webrtc/p2p/base/transportinfo.h
index 504eb23..c38bf2a 100644
--- a/webrtc/p2p/base/transportinfo.h
+++ b/webrtc/p2p/base/transportinfo.h
@@ -17,7 +17,7 @@
#include "webrtc/p2p/base/candidate.h"
#include "webrtc/p2p/base/p2pconstants.h"
#include "webrtc/p2p/base/transportdescription.h"
-#include "webrtc/base/helpers.h"
+#include "webrtc/rtc_base/helpers.h"
namespace cricket {
diff --git a/webrtc/p2p/base/turnport.cc b/webrtc/p2p/base/turnport.cc
index e3caeb5..94f54dc 100644
--- a/webrtc/p2p/base/turnport.cc
+++ b/webrtc/p2p/base/turnport.cc
@@ -12,16 +12,16 @@
#include <functional>
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/nethelpers.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/stringencode.h"
#include "webrtc/p2p/base/common.h"
#include "webrtc/p2p/base/stun.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/nethelpers.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/stringencode.h"
namespace cricket {
diff --git a/webrtc/p2p/base/turnport.h b/webrtc/p2p/base/turnport.h
index e5f384f..4e4d4b1 100644
--- a/webrtc/p2p/base/turnport.h
+++ b/webrtc/p2p/base/turnport.h
@@ -16,10 +16,10 @@
#include <set>
#include <string>
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/asyncpacketsocket.h"
#include "webrtc/p2p/base/port.h"
#include "webrtc/p2p/client/basicportallocator.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
namespace rtc {
class AsyncResolver;
diff --git a/webrtc/p2p/base/turnport_unittest.cc b/webrtc/p2p/base/turnport_unittest.cc
index 35f0afb..73426cc 100644
--- a/webrtc/p2p/base/turnport_unittest.cc
+++ b/webrtc/p2p/base/turnport_unittest.cc
@@ -20,20 +20,20 @@
#include "webrtc/p2p/base/testturnserver.h"
#include "webrtc/p2p/base/turnport.h"
#include "webrtc/p2p/base/udpport.h"
-#include "webrtc/base/asynctcpsocket.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/dscp.h"
-#include "webrtc/base/fakeclock.h"
-#include "webrtc/base/firewallsocketserver.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/socketadapters.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
+#include "webrtc/rtc_base/asynctcpsocket.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/dscp.h"
+#include "webrtc/rtc_base/fakeclock.h"
+#include "webrtc/rtc_base/firewallsocketserver.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/socketadapters.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
using rtc::SocketAddress;
diff --git a/webrtc/p2p/base/turnserver.cc b/webrtc/p2p/base/turnserver.cc
index 368bea1..afc5f1d 100644
--- a/webrtc/p2p/base/turnserver.cc
+++ b/webrtc/p2p/base/turnserver.cc
@@ -12,20 +12,20 @@
#include <tuple> // for std::tie
-#include "webrtc/base/bind.h"
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/messagedigest.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/socketadapters.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/thread.h"
#include "webrtc/p2p/base/asyncstuntcpsocket.h"
#include "webrtc/p2p/base/common.h"
#include "webrtc/p2p/base/packetsocketfactory.h"
#include "webrtc/p2p/base/stun.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/messagedigest.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/socketadapters.h"
+#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/rtc_base/thread.h"
namespace cricket {
diff --git a/webrtc/p2p/base/turnserver.h b/webrtc/p2p/base/turnserver.h
index 608e043..0a59f27 100644
--- a/webrtc/p2p/base/turnserver.h
+++ b/webrtc/p2p/base/turnserver.h
@@ -19,11 +19,11 @@
#include <vector>
#include "webrtc/p2p/base/portinterface.h"
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/messagequeue.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/socketaddress.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/messagequeue.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/socketaddress.h"
namespace rtc {
class ByteBufferWriter;
diff --git a/webrtc/p2p/base/turnserver_unittest.cc b/webrtc/p2p/base/turnserver_unittest.cc
index 970da47..cac0a5c 100644
--- a/webrtc/p2p/base/turnserver_unittest.cc
+++ b/webrtc/p2p/base/turnserver_unittest.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/virtualsocketserver.h"
-#include "webrtc/p2p/base/basicpacketsocketfactory.h"
#include "webrtc/p2p/base/turnserver.h"
+#include "webrtc/p2p/base/basicpacketsocketfactory.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
// NOTE: This is a work in progress. Currently this file only has tests for
// TurnServerConnection, a primitive class used by TurnServer.
diff --git a/webrtc/p2p/base/udptransport.cc b/webrtc/p2p/base/udptransport.cc
index 976d5bb..3df47ad 100644
--- a/webrtc/p2p/base/udptransport.cc
+++ b/webrtc/p2p/base/udptransport.cc
@@ -13,12 +13,12 @@
#include <string>
#include <utility> // For std::move.
-#include "webrtc/base/asyncudpsocket.h"
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/thread_checker.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/asyncudpsocket.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/thread_checker.h"
namespace cricket {
diff --git a/webrtc/p2p/base/udptransport.h b/webrtc/p2p/base/udptransport.h
index 1cf8e42..c3c9513 100644
--- a/webrtc/p2p/base/udptransport.h
+++ b/webrtc/p2p/base/udptransport.h
@@ -15,10 +15,10 @@
#include <string>
#include "webrtc/api/ortc/udptransportinterface.h"
-#include "webrtc/base/asyncpacketsocket.h" // For PacketOptions.
-#include "webrtc/base/optional.h"
-#include "webrtc/base/thread_checker.h"
#include "webrtc/p2p/base/packettransportinternal.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h" // For PacketOptions.
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/thread_checker.h"
namespace rtc {
class AsyncPacketSocket;
diff --git a/webrtc/p2p/base/udptransport_unittest.cc b/webrtc/p2p/base/udptransport_unittest.cc
index f9db024..27455e4 100644
--- a/webrtc/p2p/base/udptransport_unittest.cc
+++ b/webrtc/p2p/base/udptransport_unittest.cc
@@ -14,16 +14,16 @@
#include <utility>
#include <vector>
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/ipaddress.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/socketserver.h"
-#include "webrtc/base/virtualsocketserver.h"
#include "webrtc/p2p/base/basicpacketsocketfactory.h"
#include "webrtc/p2p/base/packettransportinternal.h"
#include "webrtc/p2p/base/udptransport.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/ipaddress.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/socketserver.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
namespace cricket {
diff --git a/webrtc/p2p/client/basicportallocator.cc b/webrtc/p2p/client/basicportallocator.cc
index 2e5bc0d..5ddc475 100644
--- a/webrtc/p2p/client/basicportallocator.cc
+++ b/webrtc/p2p/client/basicportallocator.cc
@@ -23,9 +23,9 @@
#include "webrtc/p2p/base/tcpport.h"
#include "webrtc/p2p/base/turnport.h"
#include "webrtc/p2p/base/udpport.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
using rtc::CreateRandomId;
diff --git a/webrtc/p2p/client/basicportallocator.h b/webrtc/p2p/client/basicportallocator.h
index cd178f9..7cdf0ba 100644
--- a/webrtc/p2p/client/basicportallocator.h
+++ b/webrtc/p2p/client/basicportallocator.h
@@ -16,10 +16,10 @@
#include <vector>
#include "webrtc/p2p/base/portallocator.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/messagequeue.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/messagequeue.h"
+#include "webrtc/rtc_base/network.h"
+#include "webrtc/rtc_base/thread.h"
namespace cricket {
diff --git a/webrtc/p2p/client/basicportallocator_unittest.cc b/webrtc/p2p/client/basicportallocator_unittest.cc
index bf288c9..99e53cf 100644
--- a/webrtc/p2p/client/basicportallocator_unittest.cc
+++ b/webrtc/p2p/client/basicportallocator_unittest.cc
@@ -11,21 +11,6 @@
#include <algorithm>
#include <memory>
-#include "webrtc/base/fakeclock.h"
-#include "webrtc/base/fakenetwork.h"
-#include "webrtc/base/firewallsocketserver.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/ipaddress.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/natserver.h"
-#include "webrtc/base/natsocketfactory.h"
-#include "webrtc/base/nethelpers.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
#include "webrtc/p2p/base/basicpacketsocketfactory.h"
#include "webrtc/p2p/base/p2pconstants.h"
#include "webrtc/p2p/base/p2ptransportchannel.h"
@@ -33,6 +18,21 @@
#include "webrtc/p2p/base/teststunserver.h"
#include "webrtc/p2p/base/testturnserver.h"
#include "webrtc/p2p/client/basicportallocator.h"
+#include "webrtc/rtc_base/fakeclock.h"
+#include "webrtc/rtc_base/fakenetwork.h"
+#include "webrtc/rtc_base/firewallsocketserver.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/ipaddress.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/natserver.h"
+#include "webrtc/rtc_base/natsocketfactory.h"
+#include "webrtc/rtc_base/nethelpers.h"
+#include "webrtc/rtc_base/network.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
using rtc::IPAddress;
using rtc::SocketAddress;
diff --git a/webrtc/p2p/client/socketmonitor.cc b/webrtc/p2p/client/socketmonitor.cc
index 098a05d..4e26e42 100644
--- a/webrtc/p2p/client/socketmonitor.cc
+++ b/webrtc/p2p/client/socketmonitor.cc
@@ -10,7 +10,7 @@
#include "webrtc/p2p/client/socketmonitor.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace cricket {
diff --git a/webrtc/p2p/client/socketmonitor.h b/webrtc/p2p/client/socketmonitor.h
index b13be74..4cb1899 100644
--- a/webrtc/p2p/client/socketmonitor.h
+++ b/webrtc/p2p/client/socketmonitor.h
@@ -13,10 +13,10 @@
#include <vector>
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread.h"
#include "webrtc/p2p/base/jseptransport.h" // for ConnectionInfos
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/thread.h"
// TODO(pthatcher): Move these to connectionmonitor.h and
// connectionmonitor.cc, or just move them into channel.cc
diff --git a/webrtc/p2p/quic/quicconnectionhelper.h b/webrtc/p2p/quic/quicconnectionhelper.h
index 3588ad4..07894f0 100644
--- a/webrtc/p2p/quic/quicconnectionhelper.h
+++ b/webrtc/p2p/quic/quicconnectionhelper.h
@@ -16,7 +16,7 @@
#include "net/quic/quic_clock.h"
#include "net/quic/quic_connection.h"
#include "net/quic/quic_simple_buffer_allocator.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/thread.h"
namespace cricket {
diff --git a/webrtc/p2p/quic/quicconnectionhelper_unittest.cc b/webrtc/p2p/quic/quicconnectionhelper_unittest.cc
index 5f16b52..910caca 100644
--- a/webrtc/p2p/quic/quicconnectionhelper_unittest.cc
+++ b/webrtc/p2p/quic/quicconnectionhelper_unittest.cc
@@ -13,7 +13,7 @@
#include "webrtc/p2p/quic/quicconnectionhelper.h"
#include "net/quic/quic_time.h"
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
using cricket::QuicAlarm;
using cricket::QuicConnectionHelper;
diff --git a/webrtc/p2p/quic/quicsession.cc b/webrtc/p2p/quic/quicsession.cc
index 65ed135..c7860ef0 100644
--- a/webrtc/p2p/quic/quicsession.cc
+++ b/webrtc/p2p/quic/quicsession.cc
@@ -13,10 +13,10 @@
#include <string>
#include <utility>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/messagehandler.h"
-#include "webrtc/base/messagequeue.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/messagehandler.h"
+#include "webrtc/rtc_base/messagequeue.h"
namespace cricket {
diff --git a/webrtc/p2p/quic/quicsession.h b/webrtc/p2p/quic/quicsession.h
index f8b27e0..99195a8 100644
--- a/webrtc/p2p/quic/quicsession.h
+++ b/webrtc/p2p/quic/quicsession.h
@@ -18,10 +18,10 @@
#include "net/quic/quic_crypto_server_stream.h"
#include "net/quic/quic_crypto_stream.h"
#include "net/quic/quic_session.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/sslidentity.h"
#include "webrtc/p2p/quic/reliablequicstream.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/sslidentity.h"
namespace cricket {
diff --git a/webrtc/p2p/quic/quicsession_unittest.cc b/webrtc/p2p/quic/quicsession_unittest.cc
index 549e018..1e906fe 100644
--- a/webrtc/p2p/quic/quicsession_unittest.cc
+++ b/webrtc/p2p/quic/quicsession_unittest.cc
@@ -16,17 +16,17 @@
#include "net/base/ip_endpoint.h"
#include "net/quic/crypto/crypto_server_config_protobuf.h"
-#include "net/quic/crypto/quic_random.h"
#include "net/quic/crypto/proof_source.h"
#include "net/quic/crypto/proof_verifier.h"
#include "net/quic/crypto/quic_crypto_client_config.h"
#include "net/quic/crypto/quic_crypto_server_config.h"
+#include "net/quic/crypto/quic_random.h"
#include "net/quic/quic_crypto_client_stream.h"
#include "net/quic/quic_crypto_server_stream.h"
-#include "webrtc/base/gunit.h"
#include "webrtc/p2p/base/faketransportcontroller.h"
#include "webrtc/p2p/quic/quicconnectionhelper.h"
#include "webrtc/p2p/quic/reliablequicstream.h"
+#include "webrtc/rtc_base/gunit.h"
using net::IPAddress;
using net::IPEndPoint;
diff --git a/webrtc/p2p/quic/quictransport.cc b/webrtc/p2p/quic/quictransport.cc
index aaa11eb..8240f58 100644
--- a/webrtc/p2p/quic/quictransport.cc
+++ b/webrtc/p2p/quic/quictransport.cc
@@ -10,8 +10,8 @@
#include "webrtc/p2p/quic/quictransport.h"
-#include "webrtc/base/checks.h"
#include "webrtc/p2p/base/p2ptransportchannel.h"
+#include "webrtc/rtc_base/checks.h"
namespace cricket {
diff --git a/webrtc/p2p/quic/quictransport_unittest.cc b/webrtc/p2p/quic/quictransport_unittest.cc
index 1fd48f7..3328556 100644
--- a/webrtc/p2p/quic/quictransport_unittest.cc
+++ b/webrtc/p2p/quic/quictransport_unittest.cc
@@ -14,9 +14,9 @@
#include <string>
#include <vector>
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/rtccertificate.h"
-#include "webrtc/base/sslidentity.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/rtccertificate.h"
+#include "webrtc/rtc_base/sslidentity.h"
using cricket::TransportChannelImpl;
using cricket::QuicTransport;
diff --git a/webrtc/p2p/quic/quictransportchannel.cc b/webrtc/p2p/quic/quictransportchannel.cc
index 7241f1a..f875ab6 100644
--- a/webrtc/p2p/quic/quictransportchannel.cc
+++ b/webrtc/p2p/quic/quictransportchannel.cc
@@ -21,12 +21,12 @@
#include "net/quic/quic_crypto_server_stream.h"
#include "net/quic/quic_packet_writer.h"
#include "net/quic/quic_protocol.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/socket.h"
-#include "webrtc/base/thread.h"
#include "webrtc/p2p/base/common.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/socket.h"
+#include "webrtc/rtc_base/thread.h"
namespace {
diff --git a/webrtc/p2p/quic/quictransportchannel.h b/webrtc/p2p/quic/quictransportchannel.h
index 0e5af88..4c34675 100644
--- a/webrtc/p2p/quic/quictransportchannel.h
+++ b/webrtc/p2p/quic/quictransportchannel.h
@@ -17,11 +17,11 @@
#include "net/quic/quic_crypto_client_stream.h"
#include "net/quic/quic_packet_writer.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/optional.h"
#include "webrtc/p2p/base/transportchannelimpl.h"
#include "webrtc/p2p/quic/quicconnectionhelper.h"
#include "webrtc/p2p/quic/quicsession.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/optional.h"
namespace cricket {
diff --git a/webrtc/p2p/quic/quictransportchannel_unittest.cc b/webrtc/p2p/quic/quictransportchannel_unittest.cc
index 7337da9..9ed21f1 100644
--- a/webrtc/p2p/quic/quictransportchannel_unittest.cc
+++ b/webrtc/p2p/quic/quictransportchannel_unittest.cc
@@ -15,9 +15,9 @@
#include <string>
#include <vector>
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/sslidentity.h"
#include "webrtc/p2p/base/faketransportcontroller.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/sslidentity.h"
using cricket::ConnectionRole;
using cricket::IceRole;
diff --git a/webrtc/p2p/quic/reliablequicstream.cc b/webrtc/p2p/quic/reliablequicstream.cc
index 5b65f1e..23c2df2 100644
--- a/webrtc/p2p/quic/reliablequicstream.cc
+++ b/webrtc/p2p/quic/reliablequicstream.cc
@@ -13,7 +13,7 @@
#include <string>
#include "net/quic/quic_session.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace cricket {
diff --git a/webrtc/p2p/quic/reliablequicstream.h b/webrtc/p2p/quic/reliablequicstream.h
index 9493a3f..a2d0b57 100644
--- a/webrtc/p2p/quic/reliablequicstream.h
+++ b/webrtc/p2p/quic/reliablequicstream.h
@@ -12,9 +12,9 @@
#define WEBRTC_P2P_QUIC_RELIABLEQUICSTREAM_H_
#include "net/quic/reliable_quic_stream.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/stream.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/stream.h"
namespace cricket {
diff --git a/webrtc/p2p/quic/reliablequicstream_unittest.cc b/webrtc/p2p/quic/reliablequicstream_unittest.cc
index ff517af..4357bcd 100644
--- a/webrtc/p2p/quic/reliablequicstream_unittest.cc
+++ b/webrtc/p2p/quic/reliablequicstream_unittest.cc
@@ -17,11 +17,11 @@
#include "net/quic/quic_connection.h"
#include "net/quic/quic_protocol.h"
#include "net/quic/quic_session.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/stream.h"
#include "webrtc/p2p/quic/quicconnectionhelper.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/stream.h"
using cricket::QuicConnectionHelper;
using cricket::ReliableQuicStream;
diff --git a/webrtc/p2p/stunprober/stunprober.cc b/webrtc/p2p/stunprober/stunprober.cc
index 2ec7732..54c8b1c 100644
--- a/webrtc/p2p/stunprober/stunprober.cc
+++ b/webrtc/p2p/stunprober/stunprober.cc
@@ -13,18 +13,18 @@
#include <set>
#include <string>
-#include "webrtc/base/asyncpacketsocket.h"
-#include "webrtc/base/asyncresolverinterface.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/timeutils.h"
-#include "webrtc/base/thread.h"
#include "webrtc/p2p/base/packetsocketfactory.h"
#include "webrtc/p2p/base/stun.h"
#include "webrtc/p2p/stunprober/stunprober.h"
+#include "webrtc/rtc_base/asyncpacketsocket.h"
+#include "webrtc/rtc_base/asyncresolverinterface.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/timeutils.h"
namespace stunprober {
diff --git a/webrtc/p2p/stunprober/stunprober.h b/webrtc/p2p/stunprober/stunprober.h
index c7cc33c..b32c8b2 100644
--- a/webrtc/p2p/stunprober/stunprober.h
+++ b/webrtc/p2p/stunprober/stunprober.h
@@ -15,16 +15,16 @@
#include <string>
#include <vector>
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/callback.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/ipaddress.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/thread_checker.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/callback.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/ipaddress.h"
+#include "webrtc/rtc_base/network.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/thread_checker.h"
#include "webrtc/typedefs.h"
namespace rtc {
diff --git a/webrtc/p2p/stunprober/stunprober_unittest.cc b/webrtc/p2p/stunprober/stunprober_unittest.cc
index 519831b..2252e61 100644
--- a/webrtc/p2p/stunprober/stunprober_unittest.cc
+++ b/webrtc/p2p/stunprober/stunprober_unittest.cc
@@ -12,15 +12,15 @@
#include <memory>
-#include "webrtc/base/asyncresolverinterface.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/virtualsocketserver.h"
#include "webrtc/p2p/base/basicpacketsocketfactory.h"
#include "webrtc/p2p/base/teststunserver.h"
#include "webrtc/p2p/stunprober/stunprober.h"
+#include "webrtc/rtc_base/asyncresolverinterface.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
using stunprober::StunProber;
using stunprober::AsyncCallback;
diff --git a/webrtc/pc/audiomonitor.h b/webrtc/pc/audiomonitor.h
index 885c60f..86e8ba2 100644
--- a/webrtc/pc/audiomonitor.h
+++ b/webrtc/pc/audiomonitor.h
@@ -14,9 +14,9 @@
#include <vector>
#include <utility>
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread.h"
#include "webrtc/p2p/base/port.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/thread.h"
namespace cricket {
diff --git a/webrtc/pc/audiotrack.cc b/webrtc/pc/audiotrack.cc
index 951acbf..02607da 100644
--- a/webrtc/pc/audiotrack.cc
+++ b/webrtc/pc/audiotrack.cc
@@ -10,7 +10,7 @@
#include "webrtc/pc/audiotrack.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
using rtc::scoped_refptr;
diff --git a/webrtc/pc/audiotrack.h b/webrtc/pc/audiotrack.h
index 33f4b1f..8dde2ef 100644
--- a/webrtc/pc/audiotrack.h
+++ b/webrtc/pc/audiotrack.h
@@ -15,10 +15,10 @@
#include "webrtc/api/mediastreaminterface.h"
#include "webrtc/api/notifier.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/thread_checker.h"
#include "webrtc/pc/mediastreamtrack.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/thread_checker.h"
namespace webrtc {
diff --git a/webrtc/pc/bundlefilter.cc b/webrtc/pc/bundlefilter.cc
index 1f19a0a..3b7dcd6 100644
--- a/webrtc/pc/bundlefilter.cc
+++ b/webrtc/pc/bundlefilter.cc
@@ -10,8 +10,8 @@
#include "webrtc/pc/bundlefilter.h"
-#include "webrtc/base/logging.h"
#include "webrtc/media/base/rtputils.h"
+#include "webrtc/rtc_base/logging.h"
namespace cricket {
diff --git a/webrtc/pc/bundlefilter.h b/webrtc/pc/bundlefilter.h
index 44a45da..b4ad824 100644
--- a/webrtc/pc/bundlefilter.h
+++ b/webrtc/pc/bundlefilter.h
@@ -16,8 +16,8 @@
#include <set>
#include <vector>
-#include "webrtc/base/basictypes.h"
#include "webrtc/media/base/streamparams.h"
+#include "webrtc/rtc_base/basictypes.h"
namespace cricket {
diff --git a/webrtc/pc/bundlefilter_unittest.cc b/webrtc/pc/bundlefilter_unittest.cc
index 179f0cf..f0f56a5 100644
--- a/webrtc/pc/bundlefilter_unittest.cc
+++ b/webrtc/pc/bundlefilter_unittest.cc
@@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/base/gunit.h"
#include "webrtc/pc/bundlefilter.h"
+#include "webrtc/rtc_base/gunit.h"
using cricket::StreamParams;
diff --git a/webrtc/pc/channel.cc b/webrtc/pc/channel.cc
index e612aae..d07126b 100644
--- a/webrtc/pc/channel.cc
+++ b/webrtc/pc/channel.cc
@@ -15,16 +15,16 @@
#include "webrtc/pc/channel.h"
#include "webrtc/api/call/audio_sink.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/dscp.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/networkroute.h"
-#include "webrtc/base/trace_event.h"
#include "webrtc/media/base/mediaconstants.h"
#include "webrtc/media/base/rtputils.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/dscp.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/networkroute.h"
+#include "webrtc/rtc_base/trace_event.h"
// Adding 'nogncheck' to disable the gn include headers check to support modular
// WebRTC build targets.
#include "webrtc/media/engine/webrtcvoiceengine.h" // nogncheck
diff --git a/webrtc/pc/channel.h b/webrtc/pc/channel.h
index f8cc286..8b3be2c 100644
--- a/webrtc/pc/channel.h
+++ b/webrtc/pc/channel.h
@@ -20,12 +20,6 @@
#include "webrtc/api/call/audio_sink.h"
#include "webrtc/api/rtpreceiverinterface.h"
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/asyncudpsocket.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/window.h"
#include "webrtc/media/base/mediachannel.h"
#include "webrtc/media/base/mediaengine.h"
#include "webrtc/media/base/streamparams.h"
@@ -41,6 +35,12 @@
#include "webrtc/pc/rtcpmuxfilter.h"
#include "webrtc/pc/rtptransport.h"
#include "webrtc/pc/srtpfilter.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/asyncudpsocket.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/network.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/window.h"
namespace webrtc {
class AudioSinkInterface;
diff --git a/webrtc/pc/channel_unittest.cc b/webrtc/pc/channel_unittest.cc
index 7fe1472..fa9d3da 100644
--- a/webrtc/pc/channel_unittest.cc
+++ b/webrtc/pc/channel_unittest.cc
@@ -10,13 +10,6 @@
#include <memory>
-#include "webrtc/base/array_view.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/fakeclock.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/sslstreamadapter.h"
#include "webrtc/media/base/fakemediaengine.h"
#include "webrtc/media/base/fakertp.h"
#include "webrtc/media/base/mediachannel.h"
@@ -25,6 +18,13 @@
#include "webrtc/p2p/base/fakedtlstransport.h"
#include "webrtc/p2p/base/fakepackettransport.h"
#include "webrtc/pc/channel.h"
+#include "webrtc/rtc_base/array_view.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/fakeclock.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
using cricket::CA_OFFER;
using cricket::CA_PRANSWER;
diff --git a/webrtc/pc/channelmanager.cc b/webrtc/pc/channelmanager.cc
index 68ac281..368cf45 100644
--- a/webrtc/pc/channelmanager.cc
+++ b/webrtc/pc/channelmanager.cc
@@ -12,15 +12,15 @@
#include <algorithm>
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/trace_event.h"
#include "webrtc/media/base/device.h"
#include "webrtc/media/base/rtpdataengine.h"
#include "webrtc/pc/srtpfilter.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/rtc_base/trace_event.h"
namespace cricket {
diff --git a/webrtc/pc/channelmanager.h b/webrtc/pc/channelmanager.h
index 94e98d9..e8c0165 100644
--- a/webrtc/pc/channelmanager.h
+++ b/webrtc/pc/channelmanager.h
@@ -15,10 +15,10 @@
#include <string>
#include <vector>
-#include "webrtc/base/fileutils.h"
-#include "webrtc/base/thread.h"
#include "webrtc/media/base/mediaengine.h"
#include "webrtc/pc/voicechannel.h"
+#include "webrtc/rtc_base/fileutils.h"
+#include "webrtc/rtc_base/thread.h"
namespace cricket {
diff --git a/webrtc/pc/channelmanager_unittest.cc b/webrtc/pc/channelmanager_unittest.cc
index 1919aae..c03056c 100644
--- a/webrtc/pc/channelmanager_unittest.cc
+++ b/webrtc/pc/channelmanager_unittest.cc
@@ -10,9 +10,6 @@
#include <memory>
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/thread.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
#include "webrtc/media/base/fakemediaengine.h"
#include "webrtc/media/base/fakevideocapturer.h"
@@ -20,6 +17,9 @@
#include "webrtc/media/engine/fakewebrtccall.h"
#include "webrtc/p2p/base/faketransportcontroller.h"
#include "webrtc/pc/channelmanager.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/thread.h"
namespace {
const bool kDefaultSrtpRequired = true;
diff --git a/webrtc/pc/createpeerconnectionfactory.cc b/webrtc/pc/createpeerconnectionfactory.cc
index 6861d82..11aa121 100644
--- a/webrtc/pc/createpeerconnectionfactory.cc
+++ b/webrtc/pc/createpeerconnectionfactory.cc
@@ -11,13 +11,13 @@
#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h"
#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/thread.h"
#include "webrtc/call/callfactoryinterface.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log_factory_interface.h"
#include "webrtc/media/engine/webrtcmediaengine.h"
#include "webrtc/modules/audio_processing/include/audio_processing.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/thread.h"
namespace webrtc {
diff --git a/webrtc/pc/currentspeakermonitor.cc b/webrtc/pc/currentspeakermonitor.cc
index ce0d579..d52e79d 100644
--- a/webrtc/pc/currentspeakermonitor.cc
+++ b/webrtc/pc/currentspeakermonitor.cc
@@ -12,9 +12,9 @@
#include <vector>
-#include "webrtc/base/logging.h"
#include "webrtc/media/base/streamparams.h"
#include "webrtc/pc/audiomonitor.h"
+#include "webrtc/rtc_base/logging.h"
namespace cricket {
diff --git a/webrtc/pc/currentspeakermonitor.h b/webrtc/pc/currentspeakermonitor.h
index 14ed876..001035f 100644
--- a/webrtc/pc/currentspeakermonitor.h
+++ b/webrtc/pc/currentspeakermonitor.h
@@ -18,7 +18,7 @@
#include <map>
-#include "webrtc/base/sigslot.h"
+#include "webrtc/rtc_base/sigslot.h"
namespace cricket {
diff --git a/webrtc/pc/currentspeakermonitor_unittest.cc b/webrtc/pc/currentspeakermonitor_unittest.cc
index a71f72e..547b5a2 100644
--- a/webrtc/pc/currentspeakermonitor_unittest.cc
+++ b/webrtc/pc/currentspeakermonitor_unittest.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/pc/audiomonitor.h"
#include "webrtc/pc/currentspeakermonitor.h"
+#include "webrtc/pc/audiomonitor.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/thread.h"
namespace cricket {
diff --git a/webrtc/pc/datachannel.cc b/webrtc/pc/datachannel.cc
index 5606a64..ce0aa14 100644
--- a/webrtc/pc/datachannel.cc
+++ b/webrtc/pc/datachannel.cc
@@ -13,11 +13,11 @@
#include <memory>
#include <string>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/refcount.h"
#include "webrtc/media/sctp/sctptransportinternal.h"
#include "webrtc/pc/sctputils.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/refcount.h"
namespace webrtc {
diff --git a/webrtc/pc/datachannel.h b/webrtc/pc/datachannel.h
index 2619a85..13f5b88 100644
--- a/webrtc/pc/datachannel.h
+++ b/webrtc/pc/datachannel.h
@@ -17,11 +17,11 @@
#include "webrtc/api/datachannelinterface.h"
#include "webrtc/api/proxy.h"
-#include "webrtc/base/messagehandler.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/sigslot.h"
#include "webrtc/media/base/mediachannel.h"
#include "webrtc/pc/channel.h"
+#include "webrtc/rtc_base/messagehandler.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/sigslot.h"
namespace webrtc {
diff --git a/webrtc/pc/datachannel_unittest.cc b/webrtc/pc/datachannel_unittest.cc
index 13ab63c..8776dce 100644
--- a/webrtc/pc/datachannel_unittest.cc
+++ b/webrtc/pc/datachannel_unittest.cc
@@ -10,10 +10,10 @@
#include <memory>
-#include "webrtc/base/gunit.h"
#include "webrtc/pc/datachannel.h"
#include "webrtc/pc/sctputils.h"
#include "webrtc/pc/test/fakedatachannelprovider.h"
+#include "webrtc/rtc_base/gunit.h"
using webrtc::DataChannel;
using webrtc::SctpSidAllocator;
diff --git a/webrtc/pc/dtmfsender.cc b/webrtc/pc/dtmfsender.cc
index a08a53c..3a95c2a 100644
--- a/webrtc/pc/dtmfsender.cc
+++ b/webrtc/pc/dtmfsender.cc
@@ -14,9 +14,9 @@
#include <string>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/thread.h"
namespace webrtc {
diff --git a/webrtc/pc/dtmfsender.h b/webrtc/pc/dtmfsender.h
index 5eab055..28156f3 100644
--- a/webrtc/pc/dtmfsender.h
+++ b/webrtc/pc/dtmfsender.h
@@ -16,9 +16,9 @@
#include "webrtc/api/dtmfsenderinterface.h"
#include "webrtc/api/mediastreaminterface.h"
#include "webrtc/api/proxy.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/messagehandler.h"
-#include "webrtc/base/refcount.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/messagehandler.h"
+#include "webrtc/rtc_base/refcount.h"
// DtmfSender is the native implementation of the RTCDTMFSender defined by
// the WebRTC W3C Editor's Draft.
diff --git a/webrtc/pc/dtmfsender_unittest.cc b/webrtc/pc/dtmfsender_unittest.cc
index 8401976..400444e 100644
--- a/webrtc/pc/dtmfsender_unittest.cc
+++ b/webrtc/pc/dtmfsender_unittest.cc
@@ -15,11 +15,11 @@
#include <string>
#include <vector>
-#include "webrtc/base/fakeclock.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/timeutils.h"
#include "webrtc/pc/audiotrack.h"
+#include "webrtc/rtc_base/fakeclock.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/timeutils.h"
using webrtc::AudioTrackInterface;
using webrtc::AudioTrack;
diff --git a/webrtc/pc/externalhmac.cc b/webrtc/pc/externalhmac.cc
index 94e39d3..34cab08 100644
--- a/webrtc/pc/externalhmac.cc
+++ b/webrtc/pc/externalhmac.cc
@@ -12,7 +12,7 @@
#include <stdlib.h> // For malloc/free.
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
#include "third_party/libsrtp/crypto/include/crypto_kernel.h"
#include "third_party/libsrtp/include/srtp.h"
diff --git a/webrtc/pc/iceserverparsing.cc b/webrtc/pc/iceserverparsing.cc
index 7db3963..d9f4885 100644
--- a/webrtc/pc/iceserverparsing.cc
+++ b/webrtc/pc/iceserverparsing.cc
@@ -13,7 +13,7 @@
#include <cctype> // For std::isdigit.
#include <string>
-#include "webrtc/base/arraysize.h"
+#include "webrtc/rtc_base/arraysize.h"
namespace webrtc {
diff --git a/webrtc/pc/iceserverparsing_unittest.cc b/webrtc/pc/iceserverparsing_unittest.cc
index 46e010a..d433963 100644
--- a/webrtc/pc/iceserverparsing_unittest.cc
+++ b/webrtc/pc/iceserverparsing_unittest.cc
@@ -11,8 +11,8 @@
#include <string>
#include <vector>
-#include "webrtc/base/gunit.h"
#include "webrtc/pc/iceserverparsing.h"
+#include "webrtc/rtc_base/gunit.h"
namespace webrtc {
diff --git a/webrtc/pc/jsepicecandidate.cc b/webrtc/pc/jsepicecandidate.cc
index 51faa07..dbe05e4 100644
--- a/webrtc/pc/jsepicecandidate.cc
+++ b/webrtc/pc/jsepicecandidate.cc
@@ -12,8 +12,8 @@
#include <vector>
-#include "webrtc/base/stringencode.h"
#include "webrtc/pc/webrtcsdp.h"
+#include "webrtc/rtc_base/stringencode.h"
namespace webrtc {
diff --git a/webrtc/pc/jsepsessiondescription.cc b/webrtc/pc/jsepsessiondescription.cc
index ab34528..2e972ea 100644
--- a/webrtc/pc/jsepsessiondescription.cc
+++ b/webrtc/pc/jsepsessiondescription.cc
@@ -12,10 +12,10 @@
#include <memory>
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/stringencode.h"
#include "webrtc/pc/mediasession.h"
#include "webrtc/pc/webrtcsdp.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/stringencode.h"
using cricket::SessionDescription;
diff --git a/webrtc/pc/jsepsessiondescription_unittest.cc b/webrtc/pc/jsepsessiondescription_unittest.cc
index c406ad8..4d8218a 100644
--- a/webrtc/pc/jsepsessiondescription_unittest.cc
+++ b/webrtc/pc/jsepsessiondescription_unittest.cc
@@ -13,14 +13,14 @@
#include "webrtc/api/jsepicecandidate.h"
#include "webrtc/api/jsepsessiondescription.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/stringencode.h"
#include "webrtc/p2p/base/candidate.h"
#include "webrtc/p2p/base/p2pconstants.h"
#include "webrtc/p2p/base/sessiondescription.h"
#include "webrtc/pc/mediasession.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/stringencode.h"
using webrtc::IceCandidateCollection;
using webrtc::IceCandidateInterface;
diff --git a/webrtc/pc/localaudiosource_unittest.cc b/webrtc/pc/localaudiosource_unittest.cc
index eb42213..9b26095 100644
--- a/webrtc/pc/localaudiosource_unittest.cc
+++ b/webrtc/pc/localaudiosource_unittest.cc
@@ -14,9 +14,9 @@
#include <vector>
#include "webrtc/api/test/fakeconstraints.h"
-#include "webrtc/base/gunit.h"
#include "webrtc/media/base/fakemediaengine.h"
#include "webrtc/media/base/fakevideorenderer.h"
+#include "webrtc/rtc_base/gunit.h"
using webrtc::LocalAudioSource;
using webrtc::MediaConstraintsInterface;
diff --git a/webrtc/pc/mediaconstraintsinterface_unittest.cc b/webrtc/pc/mediaconstraintsinterface_unittest.cc
index dcf4bb7..81b5fb4 100644
--- a/webrtc/pc/mediaconstraintsinterface_unittest.cc
+++ b/webrtc/pc/mediaconstraintsinterface_unittest.cc
@@ -11,7 +11,7 @@
#include "webrtc/api/mediaconstraintsinterface.h"
#include "webrtc/api/test/fakeconstraints.h"
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
namespace webrtc {
diff --git a/webrtc/pc/mediamonitor.cc b/webrtc/pc/mediamonitor.cc
index 010f00e..22e16dc 100644
--- a/webrtc/pc/mediamonitor.cc
+++ b/webrtc/pc/mediamonitor.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/base/checks.h"
-#include "webrtc/pc/channelmanager.h"
#include "webrtc/pc/mediamonitor.h"
+#include "webrtc/pc/channelmanager.h"
+#include "webrtc/rtc_base/checks.h"
namespace cricket {
diff --git a/webrtc/pc/mediamonitor.h b/webrtc/pc/mediamonitor.h
index d294cf1..5f2a1e2 100644
--- a/webrtc/pc/mediamonitor.h
+++ b/webrtc/pc/mediamonitor.h
@@ -13,11 +13,11 @@
#ifndef WEBRTC_PC_MEDIAMONITOR_H_
#define WEBRTC_PC_MEDIAMONITOR_H_
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/thread_annotations.h"
#include "webrtc/media/base/mediachannel.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/thread_annotations.h"
namespace cricket {
diff --git a/webrtc/pc/mediasession.cc b/webrtc/pc/mediasession.cc
index f6190c2..de8f72c 100644
--- a/webrtc/pc/mediasession.cc
+++ b/webrtc/pc/mediasession.cc
@@ -18,12 +18,6 @@
#include <unordered_map>
#include <utility>
-#include "webrtc/base/base64.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/stringutils.h"
#include "webrtc/common_types.h"
#include "webrtc/media/base/cryptoparams.h"
#include "webrtc/media/base/h264_profile_level_id.h"
@@ -31,6 +25,12 @@
#include "webrtc/p2p/base/p2pconstants.h"
#include "webrtc/pc/channelmanager.h"
#include "webrtc/pc/srtpfilter.h"
+#include "webrtc/rtc_base/base64.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/stringutils.h"
namespace {
const char kInline[] = "inline:";
diff --git a/webrtc/pc/mediasession_unittest.cc b/webrtc/pc/mediasession_unittest.cc
index 670ace2..ae8d139 100644
--- a/webrtc/pc/mediasession_unittest.cc
+++ b/webrtc/pc/mediasession_unittest.cc
@@ -12,11 +12,6 @@
#include <string>
#include <vector>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/fakesslidentity.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/messagedigest.h"
-#include "webrtc/base/ssladapter.h"
#include "webrtc/media/base/codec.h"
#include "webrtc/media/base/testutils.h"
#include "webrtc/p2p/base/p2pconstants.h"
@@ -24,6 +19,11 @@
#include "webrtc/p2p/base/transportinfo.h"
#include "webrtc/pc/mediasession.h"
#include "webrtc/pc/srtpfilter.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/fakesslidentity.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/messagedigest.h"
+#include "webrtc/rtc_base/ssladapter.h"
#define ASSERT_CRYPTO(cd, s, cs) \
ASSERT_EQ(s, cd->cryptos().size()); \
diff --git a/webrtc/pc/mediastream.cc b/webrtc/pc/mediastream.cc
index 1830792..c13d80d 100644
--- a/webrtc/pc/mediastream.cc
+++ b/webrtc/pc/mediastream.cc
@@ -9,8 +9,8 @@
*/
#include "webrtc/pc/mediastream.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
namespace webrtc {
diff --git a/webrtc/pc/mediastream_unittest.cc b/webrtc/pc/mediastream_unittest.cc
index e2e3985..01a547b 100644
--- a/webrtc/pc/mediastream_unittest.cc
+++ b/webrtc/pc/mediastream_unittest.cc
@@ -10,14 +10,14 @@
#include <string>
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/refcount.h"
-#include "webrtc/test/gmock.h"
-#include "webrtc/test/gtest.h"
#include "webrtc/pc/audiotrack.h"
#include "webrtc/pc/mediastream.h"
#include "webrtc/pc/test/fakevideotracksource.h"
#include "webrtc/pc/videotrack.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/refcount.h"
+#include "webrtc/test/gmock.h"
+#include "webrtc/test/gtest.h"
static const char kStreamLabel1[] = "local_stream_1";
static const char kVideoTrackId[] = "dummy_video_cam_1";
diff --git a/webrtc/pc/mediastreamobserver.h b/webrtc/pc/mediastreamobserver.h
index 5d9012b..d80c732 100644
--- a/webrtc/pc/mediastreamobserver.h
+++ b/webrtc/pc/mediastreamobserver.h
@@ -12,8 +12,8 @@
#define WEBRTC_PC_MEDIASTREAMOBSERVER_H_
#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/sigslot.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/sigslot.h"
namespace webrtc {
diff --git a/webrtc/pc/peerconnection.cc b/webrtc/pc/peerconnection.cc
index 12891df..a947c30 100644
--- a/webrtc/pc/peerconnection.cc
+++ b/webrtc/pc/peerconnection.cc
@@ -19,12 +19,6 @@
#include "webrtc/api/mediaconstraintsinterface.h"
#include "webrtc/api/mediastreamproxy.h"
#include "webrtc/api/mediastreamtrackproxy.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/trace_event.h"
#include "webrtc/call/call.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
#include "webrtc/media/sctp/sctptransport.h"
@@ -39,6 +33,12 @@
#include "webrtc/pc/streamcollection.h"
#include "webrtc/pc/videocapturertracksource.h"
#include "webrtc/pc/videotrack.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/rtc_base/trace_event.h"
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/system_wrappers/include/field_trial.h"
diff --git a/webrtc/pc/peerconnection_integrationtest.cc b/webrtc/pc/peerconnection_integrationtest.cc
index 12b99b4..d20e2f9 100644
--- a/webrtc/pc/peerconnection_integrationtest.cc
+++ b/webrtc/pc/peerconnection_integrationtest.cc
@@ -26,14 +26,6 @@
#include "webrtc/api/mediastreaminterface.h"
#include "webrtc/api/peerconnectioninterface.h"
#include "webrtc/api/test/fakeconstraints.h"
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/fakenetwork.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
#include "webrtc/media/engine/fakewebrtcvideoengine.h"
#include "webrtc/p2p/base/p2pconstants.h"
#include "webrtc/p2p/base/portinterface.h"
@@ -50,6 +42,14 @@
#include "webrtc/pc/test/fakertccertificategenerator.h"
#include "webrtc/pc/test/fakevideotrackrenderer.h"
#include "webrtc/pc/test/mockpeerconnectionobservers.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/fakenetwork.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
using cricket::ContentInfo;
using cricket::FakeWebRtcVideoDecoder;
diff --git a/webrtc/pc/peerconnectionendtoend_unittest.cc b/webrtc/pc/peerconnectionendtoend_unittest.cc
index a735ea7..c832352 100644
--- a/webrtc/pc/peerconnectionendtoend_unittest.cc
+++ b/webrtc/pc/peerconnectionendtoend_unittest.cc
@@ -12,14 +12,14 @@
#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
+#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/rtc_base/thread.h"
#ifdef WEBRTC_ANDROID
#include "webrtc/pc/test/androidtestinitializer.h"
#endif
diff --git a/webrtc/pc/peerconnectionfactory.cc b/webrtc/pc/peerconnectionfactory.cc
index 4bf118f..15e36f0 100644
--- a/webrtc/pc/peerconnectionfactory.cc
+++ b/webrtc/pc/peerconnectionfactory.cc
@@ -18,9 +18,9 @@
#include "webrtc/api/peerconnectionfactoryproxy.h"
#include "webrtc/api/peerconnectionproxy.h"
#include "webrtc/api/videosourceproxy.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
// Adding 'nogncheck' to disable the gn include headers check to support modular
// WebRTC build targets.
// TODO(zhihuang): This wouldn't be necessary if the interface and
diff --git a/webrtc/pc/peerconnectionfactory.h b/webrtc/pc/peerconnectionfactory.h
index c93594d..ebd3016 100644
--- a/webrtc/pc/peerconnectionfactory.h
+++ b/webrtc/pc/peerconnectionfactory.h
@@ -16,10 +16,10 @@
#include "webrtc/api/mediastreaminterface.h"
#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/rtccertificategenerator.h"
#include "webrtc/pc/channelmanager.h"
+#include "webrtc/rtc_base/rtccertificategenerator.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/thread.h"
namespace rtc {
class BasicNetworkManager;
diff --git a/webrtc/pc/peerconnectionfactory_unittest.cc b/webrtc/pc/peerconnectionfactory_unittest.cc
index 10aacc0..cbabc25 100644
--- a/webrtc/pc/peerconnectionfactory_unittest.cc
+++ b/webrtc/pc/peerconnectionfactory_unittest.cc
@@ -13,13 +13,13 @@
#include <utility>
#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/thread.h"
#include "webrtc/media/base/fakevideocapturer.h"
#include "webrtc/media/engine/webrtccommon.h"
#include "webrtc/media/engine/webrtcvoe.h"
#include "webrtc/p2p/base/fakeportallocator.h"
#include "webrtc/pc/peerconnectionfactory.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/thread.h"
#ifdef WEBRTC_ANDROID
#include "webrtc/pc/test/androidtestinitializer.h"
#endif
diff --git a/webrtc/pc/peerconnectioninterface_unittest.cc b/webrtc/pc/peerconnectioninterface_unittest.cc
index c36460f..c10324a 100644
--- a/webrtc/pc/peerconnectioninterface_unittest.cc
+++ b/webrtc/pc/peerconnectioninterface_unittest.cc
@@ -21,12 +21,6 @@
#include "webrtc/api/rtpreceiverinterface.h"
#include "webrtc/api/rtpsenderinterface.h"
#include "webrtc/api/test/fakeconstraints.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
#include "webrtc/media/base/fakevideocapturer.h"
#include "webrtc/media/engine/webrtcmediaengine.h"
#include "webrtc/media/sctp/sctptransportinternal.h"
@@ -43,6 +37,12 @@
#include "webrtc/pc/test/testsdpstrings.h"
#include "webrtc/pc/videocapturertracksource.h"
#include "webrtc/pc/videotrack.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
+#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
#include "webrtc/test/gmock.h"
#ifdef WEBRTC_ANDROID
diff --git a/webrtc/pc/proxy_unittest.cc b/webrtc/pc/proxy_unittest.cc
index d7acdc1..0d97c41 100644
--- a/webrtc/pc/proxy_unittest.cc
+++ b/webrtc/pc/proxy_unittest.cc
@@ -13,9 +13,9 @@
#include <memory>
#include <string>
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/refcount.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/refcount.h"
+#include "webrtc/rtc_base/thread.h"
#include "webrtc/test/gmock.h"
using ::testing::_;
diff --git a/webrtc/pc/quicdatachannel.cc b/webrtc/pc/quicdatachannel.cc
index 8907ce7..ab8675d 100644
--- a/webrtc/pc/quicdatachannel.cc
+++ b/webrtc/pc/quicdatachannel.cc
@@ -10,12 +10,12 @@
#include "webrtc/pc/quicdatachannel.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/logging.h"
#include "webrtc/p2p/quic/quictransportchannel.h"
#include "webrtc/p2p/quic/reliablequicstream.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/logging.h"
namespace webrtc {
diff --git a/webrtc/pc/quicdatachannel.h b/webrtc/pc/quicdatachannel.h
index 2f6288b..f580c4b 100644
--- a/webrtc/pc/quicdatachannel.h
+++ b/webrtc/pc/quicdatachannel.h
@@ -16,9 +16,9 @@
#include <unordered_set>
#include "webrtc/api/datachannelinterface.h"
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/thread.h"
namespace cricket {
class QuicTransportChannel;
diff --git a/webrtc/pc/quicdatachannel_unittest.cc b/webrtc/pc/quicdatachannel_unittest.cc
index 649c36f..173d6df 100644
--- a/webrtc/pc/quicdatachannel_unittest.cc
+++ b/webrtc/pc/quicdatachannel_unittest.cc
@@ -16,12 +16,12 @@
#include <string>
#include <vector>
-#include "webrtc/base/bind.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/scoped_ref_ptr.h"
#include "webrtc/p2p/base/faketransportcontroller.h"
#include "webrtc/p2p/quic/quictransportchannel.h"
#include "webrtc/p2p/quic/reliablequicstream.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
using cricket::FakeTransportChannel;
using cricket::QuicTransportChannel;
diff --git a/webrtc/pc/quicdatatransport.cc b/webrtc/pc/quicdatatransport.cc
index 8b0a93f..142085e 100644
--- a/webrtc/pc/quicdatatransport.cc
+++ b/webrtc/pc/quicdatatransport.cc
@@ -10,10 +10,10 @@
#include "webrtc/pc/quicdatatransport.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/logging.h"
#include "webrtc/p2p/quic/quictransportchannel.h"
#include "webrtc/p2p/quic/reliablequicstream.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/logging.h"
namespace webrtc {
diff --git a/webrtc/pc/quicdatatransport.h b/webrtc/pc/quicdatatransport.h
index 6b35a10..946e6b0 100644
--- a/webrtc/pc/quicdatatransport.h
+++ b/webrtc/pc/quicdatatransport.h
@@ -15,11 +15,11 @@
#include <unordered_map>
#include "webrtc/api/datachannelinterface.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/thread.h"
#include "webrtc/p2p/base/transportcontroller.h"
#include "webrtc/pc/quicdatachannel.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/thread.h"
namespace cricket {
class QuicTransportChannel;
diff --git a/webrtc/pc/quicdatatransport_unittest.cc b/webrtc/pc/quicdatatransport_unittest.cc
index af28159..8d6c189 100644
--- a/webrtc/pc/quicdatatransport_unittest.cc
+++ b/webrtc/pc/quicdatatransport_unittest.cc
@@ -16,12 +16,12 @@
#include <unordered_map>
#include <vector>
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/gunit.h"
#include "webrtc/p2p/base/faketransportcontroller.h"
#include "webrtc/p2p/quic/quictransportchannel.h"
#include "webrtc/p2p/quic/reliablequicstream.h"
#include "webrtc/pc/quicdatachannel.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/gunit.h"
using webrtc::DataBuffer;
using webrtc::DataChannelInit;
diff --git a/webrtc/pc/remoteaudiosource.cc b/webrtc/pc/remoteaudiosource.cc
index b256819..8d1a5d0 100644
--- a/webrtc/pc/remoteaudiosource.cc
+++ b/webrtc/pc/remoteaudiosource.cc
@@ -15,10 +15,10 @@
#include <memory>
#include <utility>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/thread.h"
namespace webrtc {
diff --git a/webrtc/pc/remoteaudiosource.h b/webrtc/pc/remoteaudiosource.h
index b84a016..14c16a7 100644
--- a/webrtc/pc/remoteaudiosource.h
+++ b/webrtc/pc/remoteaudiosource.h
@@ -16,8 +16,8 @@
#include "webrtc/api/call/audio_sink.h"
#include "webrtc/api/notifier.h"
-#include "webrtc/base/criticalsection.h"
#include "webrtc/pc/channel.h"
+#include "webrtc/rtc_base/criticalsection.h"
namespace rtc {
struct Message;
diff --git a/webrtc/pc/rtcpmuxfilter.cc b/webrtc/pc/rtcpmuxfilter.cc
index f3ae468..67293b3 100644
--- a/webrtc/pc/rtcpmuxfilter.cc
+++ b/webrtc/pc/rtcpmuxfilter.cc
@@ -10,7 +10,7 @@
#include "webrtc/pc/rtcpmuxfilter.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
namespace cricket {
diff --git a/webrtc/pc/rtcpmuxfilter_unittest.cc b/webrtc/pc/rtcpmuxfilter_unittest.cc
index 807103a..bd2fea1 100644
--- a/webrtc/pc/rtcpmuxfilter_unittest.cc
+++ b/webrtc/pc/rtcpmuxfilter_unittest.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/base/gunit.h"
-#include "webrtc/media/base/testutils.h"
#include "webrtc/pc/rtcpmuxfilter.h"
+#include "webrtc/media/base/testutils.h"
+#include "webrtc/rtc_base/gunit.h"
TEST(RtcpMuxFilterTest, IsActiveSender) {
cricket::RtcpMuxFilter filter;
diff --git a/webrtc/pc/rtcstats_integrationtest.cc b/webrtc/pc/rtcstats_integrationtest.cc
index 3337c4e..3d1e7d6 100644
--- a/webrtc/pc/rtcstats_integrationtest.cc
+++ b/webrtc/pc/rtcstats_integrationtest.cc
@@ -17,13 +17,13 @@
#include "webrtc/api/peerconnectioninterface.h"
#include "webrtc/api/stats/rtcstats_objects.h"
#include "webrtc/api/stats/rtcstatsreport.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/refcountedobject.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/virtualsocketserver.h"
#include "webrtc/pc/test/peerconnectiontestwrapper.h"
#include "webrtc/pc/test/rtcstatsobtainer.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/refcountedobject.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
namespace webrtc {
diff --git a/webrtc/pc/rtcstatscollector.cc b/webrtc/pc/rtcstatscollector.cc
index ca99532..f5b8c8a 100644
--- a/webrtc/pc/rtcstatscollector.cc
+++ b/webrtc/pc/rtcstatscollector.cc
@@ -17,14 +17,14 @@
#include "webrtc/api/mediastreaminterface.h"
#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/timeutils.h"
#include "webrtc/media/base/mediachannel.h"
#include "webrtc/p2p/base/candidate.h"
#include "webrtc/p2p/base/p2pconstants.h"
#include "webrtc/p2p/base/port.h"
#include "webrtc/pc/peerconnection.h"
#include "webrtc/pc/webrtcsession.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/timeutils.h"
namespace webrtc {
diff --git a/webrtc/pc/rtcstatscollector.h b/webrtc/pc/rtcstatscollector.h
index 9dce0fe..980edd6 100644
--- a/webrtc/pc/rtcstatscollector.h
+++ b/webrtc/pc/rtcstatscollector.h
@@ -19,17 +19,17 @@
#include "webrtc/api/stats/rtcstats_objects.h"
#include "webrtc/api/stats/rtcstatscollectorcallback.h"
#include "webrtc/api/stats/rtcstatsreport.h"
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/refcount.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/sslidentity.h"
-#include "webrtc/base/timeutils.h"
#include "webrtc/call/call.h"
#include "webrtc/media/base/mediachannel.h"
#include "webrtc/pc/datachannel.h"
#include "webrtc/pc/trackmediainfomap.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/refcount.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/sslidentity.h"
+#include "webrtc/rtc_base/timeutils.h"
namespace cricket {
class Candidate;
diff --git a/webrtc/pc/rtcstatscollector_unittest.cc b/webrtc/pc/rtcstatscollector_unittest.cc
index 7b78632..43c94ef 100644
--- a/webrtc/pc/rtcstatscollector_unittest.cc
+++ b/webrtc/pc/rtcstatscollector_unittest.cc
@@ -22,15 +22,6 @@
#include "webrtc/api/stats/rtcstatsreport.h"
#include "webrtc/api/test/mock_rtpreceiver.h"
#include "webrtc/api/test/mock_rtpsender.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/fakeclock.h"
-#include "webrtc/base/fakesslidentity.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/socketaddress.h"
-#include "webrtc/base/thread_checker.h"
-#include "webrtc/base/timedelta.h"
-#include "webrtc/base/timeutils.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
#include "webrtc/media/base/fakemediaengine.h"
#include "webrtc/media/base/test/mock_mediachannel.h"
@@ -42,6 +33,15 @@
#include "webrtc/pc/test/mock_peerconnection.h"
#include "webrtc/pc/test/mock_webrtcsession.h"
#include "webrtc/pc/test/rtcstatsobtainer.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/fakeclock.h"
+#include "webrtc/rtc_base/fakesslidentity.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/socketaddress.h"
+#include "webrtc/rtc_base/thread_checker.h"
+#include "webrtc/rtc_base/timedelta.h"
+#include "webrtc/rtc_base/timeutils.h"
using testing::_;
using testing::Invoke;
diff --git a/webrtc/pc/rtpreceiver.cc b/webrtc/pc/rtpreceiver.cc
index 96974ee..f3eef5a 100644
--- a/webrtc/pc/rtpreceiver.cc
+++ b/webrtc/pc/rtpreceiver.cc
@@ -12,9 +12,9 @@
#include "webrtc/api/mediastreamtrackproxy.h"
#include "webrtc/api/videosourceproxy.h"
-#include "webrtc/base/trace_event.h"
#include "webrtc/pc/audiotrack.h"
#include "webrtc/pc/videotrack.h"
+#include "webrtc/rtc_base/trace_event.h"
namespace webrtc {
diff --git a/webrtc/pc/rtpreceiver.h b/webrtc/pc/rtpreceiver.h
index b0ea247..9809b73 100644
--- a/webrtc/pc/rtpreceiver.h
+++ b/webrtc/pc/rtpreceiver.h
@@ -21,12 +21,12 @@
#include "webrtc/api/mediastreaminterface.h"
#include "webrtc/api/rtpreceiverinterface.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/sigslot.h"
#include "webrtc/media/base/videobroadcaster.h"
#include "webrtc/pc/channel.h"
#include "webrtc/pc/remoteaudiosource.h"
#include "webrtc/pc/videotracksource.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/sigslot.h"
namespace webrtc {
diff --git a/webrtc/pc/rtpsender.cc b/webrtc/pc/rtpsender.cc
index 5cf13d0..a16a28c 100644
--- a/webrtc/pc/rtpsender.cc
+++ b/webrtc/pc/rtpsender.cc
@@ -11,10 +11,10 @@
#include "webrtc/pc/rtpsender.h"
#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/trace_event.h"
#include "webrtc/pc/localaudiosource.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/trace_event.h"
namespace webrtc {
diff --git a/webrtc/pc/rtpsender.h b/webrtc/pc/rtpsender.h
index 57ec71e..24edb4b 100644
--- a/webrtc/pc/rtpsender.h
+++ b/webrtc/pc/rtpsender.h
@@ -20,8 +20,8 @@
#include "webrtc/api/mediastreaminterface.h"
#include "webrtc/api/rtpsenderinterface.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/criticalsection.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/criticalsection.h"
// Adding 'nogncheck' to disable the gn include headers check to support modular
// WebRTC build targets.
#include "webrtc/media/base/audiosource.h" // nogncheck
diff --git a/webrtc/pc/rtpsenderreceiver_unittest.cc b/webrtc/pc/rtpsenderreceiver_unittest.cc
index 994cf3d..bf413e4 100644
--- a/webrtc/pc/rtpsenderreceiver_unittest.cc
+++ b/webrtc/pc/rtpsenderreceiver_unittest.cc
@@ -12,8 +12,6 @@
#include <string>
#include <utility>
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/sigslot.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
#include "webrtc/media/base/fakemediaengine.h"
#include "webrtc/media/base/mediachannel.h"
@@ -30,6 +28,8 @@
#include "webrtc/pc/test/fakevideotracksource.h"
#include "webrtc/pc/videotrack.h"
#include "webrtc/pc/videotracksource.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/sigslot.h"
#include "webrtc/test/gmock.h"
#include "webrtc/test/gtest.h"
diff --git a/webrtc/pc/rtptransport.cc b/webrtc/pc/rtptransport.cc
index 2981675..6b0141f 100644
--- a/webrtc/pc/rtptransport.cc
+++ b/webrtc/pc/rtptransport.cc
@@ -10,11 +10,11 @@
#include "webrtc/pc/rtptransport.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/trace_event.h"
#include "webrtc/media/base/rtputils.h"
#include "webrtc/p2p/base/packettransportinterface.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/trace_event.h"
namespace webrtc {
diff --git a/webrtc/pc/rtptransport.h b/webrtc/pc/rtptransport.h
index 1224b44..87f29ba 100644
--- a/webrtc/pc/rtptransport.h
+++ b/webrtc/pc/rtptransport.h
@@ -12,8 +12,8 @@
#define WEBRTC_PC_RTPTRANSPORT_H_
#include "webrtc/api/ortc/rtptransportinterface.h"
-#include "webrtc/base/sigslot.h"
#include "webrtc/pc/bundlefilter.h"
+#include "webrtc/rtc_base/sigslot.h"
namespace rtc {
diff --git a/webrtc/pc/rtptransport_unittest.cc b/webrtc/pc/rtptransport_unittest.cc
index df84d47..4b75a05 100644
--- a/webrtc/pc/rtptransport_unittest.cc
+++ b/webrtc/pc/rtptransport_unittest.cc
@@ -10,9 +10,9 @@
#include <string>
-#include "webrtc/base/gunit.h"
#include "webrtc/p2p/base/fakepackettransport.h"
#include "webrtc/pc/rtptransport.h"
+#include "webrtc/rtc_base/gunit.h"
namespace webrtc {
diff --git a/webrtc/pc/sctputils.cc b/webrtc/pc/sctputils.cc
index 1c2f76f..48f380b 100644
--- a/webrtc/pc/sctputils.cc
+++ b/webrtc/pc/sctputils.cc
@@ -10,9 +10,9 @@
#include "webrtc/pc/sctputils.h"
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/logging.h"
namespace webrtc {
diff --git a/webrtc/pc/sctputils_unittest.cc b/webrtc/pc/sctputils_unittest.cc
index dc56e94..5ef3fcb 100644
--- a/webrtc/pc/sctputils_unittest.cc
+++ b/webrtc/pc/sctputils_unittest.cc
@@ -8,10 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/copyonwritebuffer.h"
-#include "webrtc/base/gunit.h"
#include "webrtc/pc/sctputils.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/copyonwritebuffer.h"
+#include "webrtc/rtc_base/gunit.h"
class SctpUtilsTest : public testing::Test {
public:
diff --git a/webrtc/pc/srtpfilter.cc b/webrtc/pc/srtpfilter.cc
index 62606e0..a763475 100644
--- a/webrtc/pc/srtpfilter.cc
+++ b/webrtc/pc/srtpfilter.cc
@@ -16,16 +16,16 @@
#include "third_party/libsrtp/include/srtp.h"
#include "third_party/libsrtp/include/srtp_priv.h"
-#include "webrtc/base/base64.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/timeutils.h"
#include "webrtc/media/base/rtputils.h"
#include "webrtc/pc/externalhmac.h"
+#include "webrtc/rtc_base/base64.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
+#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/rtc_base/timeutils.h"
namespace cricket {
diff --git a/webrtc/pc/srtpfilter.h b/webrtc/pc/srtpfilter.h
index 6051e52..97ae26b 100644
--- a/webrtc/pc/srtpfilter.h
+++ b/webrtc/pc/srtpfilter.h
@@ -17,13 +17,13 @@
#include <string>
#include <vector>
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/base/thread_checker.h"
#include "webrtc/media/base/cryptoparams.h"
#include "webrtc/p2p/base/sessiondescription.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
+#include "webrtc/rtc_base/thread_checker.h"
// Forward declaration to avoid pulling in libsrtp headers here
struct srtp_event_data_t;
diff --git a/webrtc/pc/srtpfilter_unittest.cc b/webrtc/pc/srtpfilter_unittest.cc
index 4d1540e..a200de2 100644
--- a/webrtc/pc/srtpfilter_unittest.cc
+++ b/webrtc/pc/srtpfilter_unittest.cc
@@ -13,14 +13,14 @@
#include "webrtc/pc/srtpfilter.h"
#include "third_party/libsrtp/include/srtp.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/thread.h"
#include "webrtc/media/base/cryptoparams.h"
#include "webrtc/media/base/fakertp.h"
#include "webrtc/p2p/base/sessiondescription.h"
+#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/thread.h"
using rtc::CS_AES_CM_128_HMAC_SHA1_80;
using rtc::CS_AES_CM_128_HMAC_SHA1_32;
diff --git a/webrtc/pc/statscollector.cc b/webrtc/pc/statscollector.cc
index c932583..17547ef 100644
--- a/webrtc/pc/statscollector.cc
+++ b/webrtc/pc/statscollector.cc
@@ -14,10 +14,10 @@
#include <utility>
#include <vector>
-#include "webrtc/base/base64.h"
-#include "webrtc/base/checks.h"
#include "webrtc/pc/channel.h"
#include "webrtc/pc/peerconnection.h"
+#include "webrtc/rtc_base/base64.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
namespace {
diff --git a/webrtc/pc/statscollector_unittest.cc b/webrtc/pc/statscollector_unittest.cc
index 165457c..9b62b81 100644
--- a/webrtc/pc/statscollector_unittest.cc
+++ b/webrtc/pc/statscollector_unittest.cc
@@ -16,11 +16,6 @@
#include "webrtc/pc/statscollector.h"
#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/base/base64.h"
-#include "webrtc/base/fakesslidentity.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/stringencode.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
#include "webrtc/media/base/fakemediaengine.h"
#include "webrtc/media/base/test/mock_mediachannel.h"
@@ -34,6 +29,11 @@
#include "webrtc/pc/test/mock_peerconnection.h"
#include "webrtc/pc/test/mock_webrtcsession.h"
#include "webrtc/pc/videotrack.h"
+#include "webrtc/rtc_base/base64.h"
+#include "webrtc/rtc_base/fakesslidentity.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/network.h"
+#include "webrtc/rtc_base/stringencode.h"
#include "webrtc/test/gmock.h"
#include "webrtc/test/gtest.h"
diff --git a/webrtc/pc/test/androidtestinitializer.cc b/webrtc/pc/test/androidtestinitializer.cc
index f070104..d1b0dab 100644
--- a/webrtc/pc/test/androidtestinitializer.cc
+++ b/webrtc/pc/test/androidtestinitializer.cc
@@ -12,7 +12,7 @@
#include <pthread.h>
-#include "webrtc/base/ignore_wundef.h"
+#include "webrtc/rtc_base/ignore_wundef.h"
// Note: this dependency is dangerous since it reaches into Chromium's base.
// There's a risk of e.g. macro clashes. This file may only be used in tests.
@@ -22,9 +22,9 @@
#include "base/android/jni_android.h"
RTC_POP_IGNORING_WUNDEF()
-#include "webrtc/base/checks.h"
-#include "webrtc/base/ssladapter.h"
#include "webrtc/modules/utility/include/jvm_android.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/ssladapter.h"
namespace webrtc {
diff --git a/webrtc/pc/test/fakeaudiocapturemodule.cc b/webrtc/pc/test/fakeaudiocapturemodule.cc
index 5c91ddf..4bc6e4f 100644
--- a/webrtc/pc/test/fakeaudiocapturemodule.cc
+++ b/webrtc/pc/test/fakeaudiocapturemodule.cc
@@ -10,10 +10,10 @@
#include "webrtc/pc/test/fakeaudiocapturemodule.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/refcount.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/refcount.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/timeutils.h"
// Audio sample value that is high enough that it doesn't occur naturally when
// frames are being faked. E.g. NetEq will not generate this large sample value
diff --git a/webrtc/pc/test/fakeaudiocapturemodule.h b/webrtc/pc/test/fakeaudiocapturemodule.h
index 72735b6..f01b3e8 100644
--- a/webrtc/pc/test/fakeaudiocapturemodule.h
+++ b/webrtc/pc/test/fakeaudiocapturemodule.h
@@ -22,12 +22,12 @@
#include <memory>
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/messagehandler.h"
-#include "webrtc/base/scoped_ref_ptr.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/audio_device/include/audio_device.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/messagehandler.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
namespace rtc {
class Thread;
diff --git a/webrtc/pc/test/fakeaudiocapturemodule_unittest.cc b/webrtc/pc/test/fakeaudiocapturemodule_unittest.cc
index aa40af7..62885c2 100644
--- a/webrtc/pc/test/fakeaudiocapturemodule_unittest.cc
+++ b/webrtc/pc/test/fakeaudiocapturemodule_unittest.cc
@@ -12,10 +12,10 @@
#include <algorithm>
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/thread.h"
using std::min;
diff --git a/webrtc/pc/test/fakedatachannelprovider.h b/webrtc/pc/test/fakedatachannelprovider.h
index 114f3de..89bb987 100644
--- a/webrtc/pc/test/fakedatachannelprovider.h
+++ b/webrtc/pc/test/fakedatachannelprovider.h
@@ -11,8 +11,8 @@
#ifndef WEBRTC_PC_TEST_FAKEDATACHANNELPROVIDER_H_
#define WEBRTC_PC_TEST_FAKEDATACHANNELPROVIDER_H_
-#include "webrtc/base/checks.h"
#include "webrtc/pc/datachannel.h"
+#include "webrtc/rtc_base/checks.h"
class FakeDataChannelProvider : public webrtc::DataChannelProviderInterface {
public:
diff --git a/webrtc/pc/test/fakeperiodicvideocapturer.h b/webrtc/pc/test/fakeperiodicvideocapturer.h
index 551df8b..02b4e4b 100644
--- a/webrtc/pc/test/fakeperiodicvideocapturer.h
+++ b/webrtc/pc/test/fakeperiodicvideocapturer.h
@@ -16,8 +16,8 @@
#include <vector>
-#include "webrtc/base/thread.h"
#include "webrtc/media/base/fakevideocapturer.h"
+#include "webrtc/rtc_base/thread.h"
namespace webrtc {
diff --git a/webrtc/pc/test/fakertccertificategenerator.h b/webrtc/pc/test/fakertccertificategenerator.h
index ce36834..39b9107 100644
--- a/webrtc/pc/test/fakertccertificategenerator.h
+++ b/webrtc/pc/test/fakertccertificategenerator.h
@@ -16,8 +16,8 @@
#include <utility>
#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/base/rtccertificate.h"
-#include "webrtc/base/rtccertificategenerator.h"
+#include "webrtc/rtc_base/rtccertificate.h"
+#include "webrtc/rtc_base/rtccertificategenerator.h"
// RSA with mod size 1024, pub exp 0x10001.
static const rtc::RTCCertificatePEM kRsaPems[] = {
diff --git a/webrtc/pc/test/mock_peerconnection.h b/webrtc/pc/test/mock_peerconnection.h
index 1256067..e743cd8 100644
--- a/webrtc/pc/test/mock_peerconnection.h
+++ b/webrtc/pc/test/mock_peerconnection.h
@@ -13,10 +13,10 @@
#include <vector>
-#include "webrtc/base/thread.h"
#include "webrtc/call/call.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
#include "webrtc/pc/peerconnection.h"
+#include "webrtc/rtc_base/thread.h"
#include "webrtc/test/gmock.h"
namespace webrtc {
diff --git a/webrtc/pc/test/mockpeerconnectionobservers.h b/webrtc/pc/test/mockpeerconnectionobservers.h
index fb4c004..5367eeb 100644
--- a/webrtc/pc/test/mockpeerconnectionobservers.h
+++ b/webrtc/pc/test/mockpeerconnectionobservers.h
@@ -17,7 +17,7 @@
#include <string>
#include "webrtc/api/datachannelinterface.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
diff --git a/webrtc/pc/test/peerconnectiontestwrapper.cc b/webrtc/pc/test/peerconnectiontestwrapper.cc
index f1bf21d..0cd2804 100644
--- a/webrtc/pc/test/peerconnectiontestwrapper.cc
+++ b/webrtc/pc/test/peerconnectiontestwrapper.cc
@@ -10,12 +10,12 @@
#include <utility>
-#include "webrtc/base/gunit.h"
#include "webrtc/p2p/base/fakeportallocator.h"
#include "webrtc/pc/test/fakeperiodicvideocapturer.h"
#include "webrtc/pc/test/fakertccertificategenerator.h"
#include "webrtc/pc/test/mockpeerconnectionobservers.h"
#include "webrtc/pc/test/peerconnectiontestwrapper.h"
+#include "webrtc/rtc_base/gunit.h"
static const char kStreamLabelBase[] = "stream_label";
static const char kVideoTrackLabelBase[] = "video_track";
diff --git a/webrtc/pc/test/peerconnectiontestwrapper.h b/webrtc/pc/test/peerconnectiontestwrapper.h
index 124e63d..c0d1ea3 100644
--- a/webrtc/pc/test/peerconnectiontestwrapper.h
+++ b/webrtc/pc/test/peerconnectiontestwrapper.h
@@ -15,9 +15,9 @@
#include "webrtc/api/peerconnectioninterface.h"
#include "webrtc/api/test/fakeconstraints.h"
-#include "webrtc/base/sigslot.h"
#include "webrtc/pc/test/fakeaudiocapturemodule.h"
#include "webrtc/pc/test/fakevideotrackrenderer.h"
+#include "webrtc/rtc_base/sigslot.h"
class PeerConnectionTestWrapper
: public webrtc::PeerConnectionObserver,
diff --git a/webrtc/pc/test/rtcstatsobtainer.h b/webrtc/pc/test/rtcstatsobtainer.h
index d0d4b61..62e995e 100644
--- a/webrtc/pc/test/rtcstatsobtainer.h
+++ b/webrtc/pc/test/rtcstatsobtainer.h
@@ -12,7 +12,7 @@
#define WEBRTC_PC_TEST_RTCSTATSOBTAINER_H_
#include "webrtc/api/stats/rtcstatsreport.h"
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
namespace webrtc {
diff --git a/webrtc/pc/trackmediainfomap.h b/webrtc/pc/trackmediainfomap.h
index ceab741..174d331 100644
--- a/webrtc/pc/trackmediainfomap.h
+++ b/webrtc/pc/trackmediainfomap.h
@@ -18,8 +18,8 @@
#include "webrtc/api/mediastreaminterface.h"
#include "webrtc/api/rtpreceiverinterface.h"
#include "webrtc/api/rtpsenderinterface.h"
-#include "webrtc/base/refcount.h"
#include "webrtc/media/base/mediachannel.h"
+#include "webrtc/rtc_base/refcount.h"
namespace webrtc {
diff --git a/webrtc/pc/trackmediainfomap_unittest.cc b/webrtc/pc/trackmediainfomap_unittest.cc
index 0743680..b380cc4 100644
--- a/webrtc/pc/trackmediainfomap_unittest.cc
+++ b/webrtc/pc/trackmediainfomap_unittest.cc
@@ -19,11 +19,11 @@
#include "webrtc/api/rtpsenderinterface.h"
#include "webrtc/api/test/mock_rtpreceiver.h"
#include "webrtc/api/test/mock_rtpsender.h"
-#include "webrtc/base/refcount.h"
#include "webrtc/media/base/mediachannel.h"
#include "webrtc/pc/audiotrack.h"
#include "webrtc/pc/test/fakevideotracksource.h"
#include "webrtc/pc/videotrack.h"
+#include "webrtc/rtc_base/refcount.h"
#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/webrtc/pc/videocapturertracksource.cc b/webrtc/pc/videocapturertracksource.cc
index 216362b..4cddf7f 100644
--- a/webrtc/pc/videocapturertracksource.cc
+++ b/webrtc/pc/videocapturertracksource.cc
@@ -15,8 +15,8 @@
#include <vector>
#include "webrtc/api/mediaconstraintsinterface.h"
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/checks.h"
using cricket::CaptureState;
using webrtc::MediaConstraintsInterface;
diff --git a/webrtc/pc/videocapturertracksource.h b/webrtc/pc/videocapturertracksource.h
index 2477340..0e6eb27 100644
--- a/webrtc/pc/videocapturertracksource.h
+++ b/webrtc/pc/videocapturertracksource.h
@@ -14,11 +14,11 @@
#include <memory>
#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/sigslot.h"
#include "webrtc/media/base/videocapturer.h"
#include "webrtc/media/base/videocommon.h"
#include "webrtc/pc/videotracksource.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/sigslot.h"
// VideoCapturerTrackSource implements VideoTrackSourceInterface. It owns a
// cricket::VideoCapturer and make sure the camera is started at a resolution
diff --git a/webrtc/pc/videocapturertracksource_unittest.cc b/webrtc/pc/videocapturertracksource_unittest.cc
index 3fe726a..b6e50ae 100644
--- a/webrtc/pc/videocapturertracksource_unittest.cc
+++ b/webrtc/pc/videocapturertracksource_unittest.cc
@@ -13,11 +13,11 @@
#include <vector>
#include "webrtc/api/test/fakeconstraints.h"
-#include "webrtc/base/gunit.h"
#include "webrtc/media/base/fakemediaengine.h"
#include "webrtc/media/base/fakevideocapturer.h"
#include "webrtc/media/base/fakevideorenderer.h"
#include "webrtc/pc/videocapturertracksource.h"
+#include "webrtc/rtc_base/gunit.h"
using webrtc::FakeConstraints;
using webrtc::VideoCapturerTrackSource;
diff --git a/webrtc/pc/videotrack.h b/webrtc/pc/videotrack.h
index 7e75e14..f251797 100644
--- a/webrtc/pc/videotrack.h
+++ b/webrtc/pc/videotrack.h
@@ -14,10 +14,10 @@
#include <string>
#include <vector>
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/thread_checker.h"
#include "webrtc/media/base/videosourcebase.h"
#include "webrtc/pc/mediastreamtrack.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/thread_checker.h"
namespace webrtc {
diff --git a/webrtc/pc/videotrack_unittest.cc b/webrtc/pc/videotrack_unittest.cc
index 6f4330f..d033efe63 100644
--- a/webrtc/pc/videotrack_unittest.cc
+++ b/webrtc/pc/videotrack_unittest.cc
@@ -11,12 +11,12 @@
#include <memory>
#include <string>
-#include "webrtc/base/gunit.h"
-#include "webrtc/media/base/fakevideocapturer.h"
#include "webrtc/media/base/fakemediaengine.h"
+#include "webrtc/media/base/fakevideocapturer.h"
#include "webrtc/pc/test/fakevideotrackrenderer.h"
#include "webrtc/pc/videocapturertracksource.h"
#include "webrtc/pc/videotrack.h"
+#include "webrtc/rtc_base/gunit.h"
using webrtc::FakeVideoTrackRenderer;
using webrtc::MediaSourceInterface;
diff --git a/webrtc/pc/videotracksource.h b/webrtc/pc/videotracksource.h
index 259b1c3..41252d8 100644
--- a/webrtc/pc/videotracksource.h
+++ b/webrtc/pc/videotracksource.h
@@ -13,9 +13,9 @@
#include "webrtc/api/mediastreaminterface.h"
#include "webrtc/api/notifier.h"
-#include "webrtc/base/thread_checker.h"
#include "webrtc/media/base/mediachannel.h"
#include "webrtc/media/base/videosinkinterface.h"
+#include "webrtc/rtc_base/thread_checker.h"
// VideoTrackSource implements VideoTrackSourceInterface.
namespace webrtc {
diff --git a/webrtc/pc/webrtcsdp.cc b/webrtc/pc/webrtcsdp.cc
index 8b08c27..d9ed425 100644
--- a/webrtc/pc/webrtcsdp.cc
+++ b/webrtc/pc/webrtcsdp.cc
@@ -22,11 +22,11 @@
#include "webrtc/api/jsepicecandidate.h"
#include "webrtc/api/jsepsessiondescription.h"
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/messagedigest.h"
-#include "webrtc/base/stringutils.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/messagedigest.h"
+#include "webrtc/rtc_base/stringutils.h"
// for RtpExtension
#include "webrtc/config.h"
#include "webrtc/media/base/codec.h"
diff --git a/webrtc/pc/webrtcsdp_unittest.cc b/webrtc/pc/webrtcsdp_unittest.cc
index af6f2c9..20b2b4e 100644
--- a/webrtc/pc/webrtcsdp_unittest.cc
+++ b/webrtc/pc/webrtcsdp_unittest.cc
@@ -14,18 +14,18 @@
#include <vector>
#include "webrtc/api/jsepsessiondescription.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/messagedigest.h"
-#include "webrtc/base/sslfingerprint.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/stringutils.h"
#include "webrtc/media/base/mediaconstants.h"
#include "webrtc/media/engine/webrtcvideoengine.h"
#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
#include "webrtc/p2p/base/p2pconstants.h"
#include "webrtc/pc/mediasession.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/messagedigest.h"
+#include "webrtc/rtc_base/sslfingerprint.h"
+#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/rtc_base/stringutils.h"
#ifdef WEBRTC_ANDROID
#include "webrtc/pc/test/androidtestinitializer.h"
#endif
diff --git a/webrtc/pc/webrtcsession.cc b/webrtc/pc/webrtcsession.cc
index e0eb72d..4f17733 100644
--- a/webrtc/pc/webrtcsession.cc
+++ b/webrtc/pc/webrtcsession.cc
@@ -21,13 +21,6 @@
#include "webrtc/api/jsepicecandidate.h"
#include "webrtc/api/jsepsessiondescription.h"
#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/stringencode.h"
-#include "webrtc/base/stringutils.h"
#include "webrtc/call/call.h"
#include "webrtc/media/base/mediaconstants.h"
#include "webrtc/media/base/videocapturer.h"
@@ -38,6 +31,13 @@
#include "webrtc/pc/mediasession.h"
#include "webrtc/pc/sctputils.h"
#include "webrtc/pc/webrtcsessiondescriptionfactory.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/helpers.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/stringencode.h"
+#include "webrtc/rtc_base/stringutils.h"
#ifdef HAVE_QUIC
#include "webrtc/p2p/quic/quictransportchannel.h"
diff --git a/webrtc/pc/webrtcsession.h b/webrtc/pc/webrtcsession.h
index cb5b69a..9b62c97 100644
--- a/webrtc/pc/webrtcsession.h
+++ b/webrtc/pc/webrtcsession.h
@@ -18,16 +18,16 @@
#include "webrtc/api/peerconnectioninterface.h"
#include "webrtc/api/statstypes.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/sslidentity.h"
-#include "webrtc/base/thread.h"
#include "webrtc/call/call.h"
#include "webrtc/p2p/base/candidate.h"
#include "webrtc/p2p/base/transportcontroller.h"
#include "webrtc/pc/datachannel.h"
#include "webrtc/pc/mediasession.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/sigslot.h"
+#include "webrtc/rtc_base/sslidentity.h"
+#include "webrtc/rtc_base/thread.h"
#ifdef HAVE_QUIC
#include "webrtc/pc/quicdatatransport.h"
diff --git a/webrtc/pc/webrtcsession_unittest.cc b/webrtc/pc/webrtcsession_unittest.cc
index 40b979d..f6d334e 100644
--- a/webrtc/pc/webrtcsession_unittest.cc
+++ b/webrtc/pc/webrtcsession_unittest.cc
@@ -15,18 +15,6 @@
#include "webrtc/api/fakemetricsobserver.h"
#include "webrtc/api/jsepicecandidate.h"
#include "webrtc/api/jsepsessiondescription.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/fakenetwork.h"
-#include "webrtc/base/firewallsocketserver.h"
-#include "webrtc/base/gunit.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/network.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/sslidentity.h"
-#include "webrtc/base/sslstreamadapter.h"
-#include "webrtc/base/stringutils.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/virtualsocketserver.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
#include "webrtc/media/base/fakemediaengine.h"
#include "webrtc/media/base/fakevideorenderer.h"
@@ -47,6 +35,18 @@
#include "webrtc/pc/videotrack.h"
#include "webrtc/pc/webrtcsession.h"
#include "webrtc/pc/webrtcsessiondescriptionfactory.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/fakenetwork.h"
+#include "webrtc/rtc_base/firewallsocketserver.h"
+#include "webrtc/rtc_base/gunit.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/network.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/sslidentity.h"
+#include "webrtc/rtc_base/sslstreamadapter.h"
+#include "webrtc/rtc_base/stringutils.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/virtualsocketserver.h"
using cricket::FakeVoiceMediaChannel;
using cricket::TransportInfo;
diff --git a/webrtc/pc/webrtcsessiondescriptionfactory.cc b/webrtc/pc/webrtcsessiondescriptionfactory.cc
index dc460ac..8eccd65 100644
--- a/webrtc/pc/webrtcsessiondescriptionfactory.cc
+++ b/webrtc/pc/webrtcsessiondescriptionfactory.cc
@@ -15,9 +15,9 @@
#include "webrtc/api/jsep.h"
#include "webrtc/api/jsepsessiondescription.h"
#include "webrtc/api/mediaconstraintsinterface.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/sslidentity.h"
#include "webrtc/pc/webrtcsession.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/sslidentity.h"
using cricket::MediaSessionOptions;
diff --git a/webrtc/pc/webrtcsessiondescriptionfactory.h b/webrtc/pc/webrtcsessiondescriptionfactory.h
index d742164..04a4fd8 100644
--- a/webrtc/pc/webrtcsessiondescriptionfactory.h
+++ b/webrtc/pc/webrtcsessiondescriptionfactory.h
@@ -14,12 +14,12 @@
#include <memory>
#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/messagehandler.h"
-#include "webrtc/base/rtccertificate.h"
-#include "webrtc/base/rtccertificategenerator.h"
#include "webrtc/p2p/base/transportdescriptionfactory.h"
#include "webrtc/pc/mediasession.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/messagehandler.h"
+#include "webrtc/rtc_base/rtccertificate.h"
+#include "webrtc/rtc_base/rtccertificategenerator.h"
namespace cricket {
class ChannelManager;
diff --git a/webrtc/rtc_tools/agc/activity_metric.cc b/webrtc/rtc_tools/agc/activity_metric.cc
index 8ea1939..2cca66b 100644
--- a/webrtc/rtc_tools/agc/activity_metric.cc
+++ b/webrtc/rtc_tools/agc/activity_metric.cc
@@ -16,8 +16,6 @@
#include <algorithm>
#include <memory>
-#include "webrtc/base/flags.h"
-#include "webrtc/base/safe_minmax.h"
#include "webrtc/modules/audio_processing/agc/agc.h"
#include "webrtc/modules/audio_processing/agc/loudness_histogram.h"
#include "webrtc/modules/audio_processing/agc/utility.h"
@@ -26,6 +24,8 @@
#include "webrtc/modules/audio_processing/vad/standalone_vad.h"
#include "webrtc/modules/audio_processing/vad/vad_audio_proc.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/flags.h"
+#include "webrtc/rtc_base/safe_minmax.h"
#include "webrtc/test/gtest.h"
static const int kAgcAnalWindowSamples = 100;
diff --git a/webrtc/rtc_tools/event_log_visualizer/analyzer.cc b/webrtc/rtc_tools/event_log_visualizer/analyzer.cc
index a9fdce6..78993f4 100644
--- a/webrtc/rtc_tools/event_log_visualizer/analyzer.cc
+++ b/webrtc/rtc_tools/event_log_visualizer/analyzer.cc
@@ -17,11 +17,6 @@
#include <string>
#include <utility>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/format_macros.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/rate_statistics.h"
#include "webrtc/call/audio_receive_stream.h"
#include "webrtc/call/audio_send_stream.h"
#include "webrtc/call/call.h"
@@ -43,6 +38,11 @@
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/format_macros.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/rate_statistics.h"
#include "webrtc/video_receive_stream.h"
#include "webrtc/video_send_stream.h"
diff --git a/webrtc/rtc_tools/event_log_visualizer/analyzer.h b/webrtc/rtc_tools/event_log_visualizer/analyzer.h
index cdc81f1..0c3fa46 100644
--- a/webrtc/rtc_tools/event_log_visualizer/analyzer.h
+++ b/webrtc/rtc_tools/event_log_visualizer/analyzer.h
@@ -18,11 +18,11 @@
#include <utility>
#include <vector>
-#include "webrtc/base/function_view.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h"
#include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
+#include "webrtc/rtc_base/function_view.h"
#include "webrtc/rtc_tools/event_log_visualizer/plot_base.h"
namespace webrtc {
diff --git a/webrtc/rtc_tools/event_log_visualizer/main.cc b/webrtc/rtc_tools/event_log_visualizer/main.cc
index 6ceeeec..6e78c89 100644
--- a/webrtc/rtc_tools/event_log_visualizer/main.cc
+++ b/webrtc/rtc_tools/event_log_visualizer/main.cc
@@ -10,8 +10,8 @@
#include <iostream>
-#include "webrtc/base/flags.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h"
+#include "webrtc/rtc_base/flags.h"
#include "webrtc/rtc_tools/event_log_visualizer/analyzer.h"
#include "webrtc/rtc_tools/event_log_visualizer/plot_base.h"
#include "webrtc/rtc_tools/event_log_visualizer/plot_python.h"
diff --git a/webrtc/rtc_tools/event_log_visualizer/plot_base.cc b/webrtc/rtc_tools/event_log_visualizer/plot_base.cc
index f1924b6..8bf3533 100644
--- a/webrtc/rtc_tools/event_log_visualizer/plot_base.cc
+++ b/webrtc/rtc_tools/event_log_visualizer/plot_base.cc
@@ -12,7 +12,7 @@
#include <algorithm>
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
namespace plotting {
diff --git a/webrtc/rtc_tools/event_log_visualizer/plot_protobuf.h b/webrtc/rtc_tools/event_log_visualizer/plot_protobuf.h
index cd9fd91..e4670db 100644
--- a/webrtc/rtc_tools/event_log_visualizer/plot_protobuf.h
+++ b/webrtc/rtc_tools/event_log_visualizer/plot_protobuf.h
@@ -10,7 +10,7 @@
#ifndef WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_
#define WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_
-#include "webrtc/base/ignore_wundef.h"
+#include "webrtc/rtc_base/ignore_wundef.h"
RTC_PUSH_IGNORING_WUNDEF()
#include "webrtc/rtc_tools/event_log_visualizer/chart.pb.h"
RTC_POP_IGNORING_WUNDEF()
diff --git a/webrtc/rtc_tools/network_tester/config_reader.h b/webrtc/rtc_tools/network_tester/config_reader.h
index 7d399f3..8cc1f8d 100644
--- a/webrtc/rtc_tools/network_tester/config_reader.h
+++ b/webrtc/rtc_tools/network_tester/config_reader.h
@@ -14,10 +14,10 @@
#include <fstream>
#include <string>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/optional.h"
-#include "webrtc/base/ignore_wundef.h"
+#include "webrtc/rtc_base/ignore_wundef.h"
#ifdef WEBRTC_NETWORK_TESTER_PROTO
RTC_PUSH_IGNORING_WUNDEF()
diff --git a/webrtc/rtc_tools/network_tester/network_tester_unittest.cc b/webrtc/rtc_tools/network_tester/network_tester_unittest.cc
index 6c86a01..d3958be 100644
--- a/webrtc/rtc_tools/network_tester/network_tester_unittest.cc
+++ b/webrtc/rtc_tools/network_tester/network_tester_unittest.cc
@@ -13,7 +13,7 @@
#include "webrtc/rtc_tools/network_tester/test_controller.h"
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
diff --git a/webrtc/rtc_tools/network_tester/packet_logger.cc b/webrtc/rtc_tools/network_tester/packet_logger.cc
index 5a32bea..ad93e71 100644
--- a/webrtc/rtc_tools/network_tester/packet_logger.cc
+++ b/webrtc/rtc_tools/network_tester/packet_logger.cc
@@ -9,8 +9,8 @@
*/
#include "webrtc/rtc_tools/network_tester/packet_logger.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/protobuf_utils.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/protobuf_utils.h"
namespace webrtc {
diff --git a/webrtc/rtc_tools/network_tester/packet_logger.h b/webrtc/rtc_tools/network_tester/packet_logger.h
index 8f8f767..33ee960 100644
--- a/webrtc/rtc_tools/network_tester/packet_logger.h
+++ b/webrtc/rtc_tools/network_tester/packet_logger.h
@@ -14,8 +14,8 @@
#include <fstream>
#include <string>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/ignore_wundef.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/ignore_wundef.h"
#ifdef WEBRTC_NETWORK_TESTER_PROTO
RTC_PUSH_IGNORING_WUNDEF()
diff --git a/webrtc/rtc_tools/network_tester/packet_sender.cc b/webrtc/rtc_tools/network_tester/packet_sender.cc
index ca5b8e9..6568ba0 100644
--- a/webrtc/rtc_tools/network_tester/packet_sender.cc
+++ b/webrtc/rtc_tools/network_tester/packet_sender.cc
@@ -14,7 +14,7 @@
#include <string>
#include <utility>
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/timeutils.h"
#include "webrtc/rtc_tools/network_tester/config_reader.h"
#include "webrtc/rtc_tools/network_tester/test_controller.h"
diff --git a/webrtc/rtc_tools/network_tester/packet_sender.h b/webrtc/rtc_tools/network_tester/packet_sender.h
index 8c4e988a..67fb0d7 100644
--- a/webrtc/rtc_tools/network_tester/packet_sender.h
+++ b/webrtc/rtc_tools/network_tester/packet_sender.h
@@ -14,10 +14,10 @@
#include <memory>
#include <string>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/ignore_wundef.h"
-#include "webrtc/base/sequenced_task_checker.h"
-#include "webrtc/base/task_queue.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/ignore_wundef.h"
+#include "webrtc/rtc_base/sequenced_task_checker.h"
+#include "webrtc/rtc_base/task_queue.h"
#ifdef WEBRTC_NETWORK_TESTER_PROTO
RTC_PUSH_IGNORING_WUNDEF()
diff --git a/webrtc/rtc_tools/network_tester/test_controller.h b/webrtc/rtc_tools/network_tester/test_controller.h
index 1608740..f38758d 100644
--- a/webrtc/rtc_tools/network_tester/test_controller.h
+++ b/webrtc/rtc_tools/network_tester/test_controller.h
@@ -17,10 +17,10 @@
#include <string>
#include <utility>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/ignore_wundef.h"
#include "webrtc/p2p/base/basicpacketsocketfactory.h"
#include "webrtc/p2p/base/udptransport.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/ignore_wundef.h"
#include "webrtc/rtc_tools/network_tester/packet_logger.h"
#include "webrtc/rtc_tools/network_tester/packet_sender.h"
diff --git a/webrtc/rtc_tools/simple_command_line_parser.h b/webrtc/rtc_tools/simple_command_line_parser.h
index 960038b..b8c9037 100644
--- a/webrtc/rtc_tools/simple_command_line_parser.h
+++ b/webrtc/rtc_tools/simple_command_line_parser.h
@@ -15,8 +15,8 @@
#include <string>
#include <vector>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/gtest_prod_util.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/gtest_prod_util.h"
// This is a very basic command line parsing class. We pass the command line
// arguments and their number and the class forms a vector out of these. Than we
diff --git a/webrtc/sdk/android/src/jni/androidmediacodeccommon.h b/webrtc/sdk/android/src/jni/androidmediacodeccommon.h
index 9f8e960..fc85f7e 100644
--- a/webrtc/sdk/android/src/jni/androidmediacodeccommon.h
+++ b/webrtc/sdk/android/src/jni/androidmediacodeccommon.h
@@ -14,11 +14,10 @@
#include <android/log.h>
#include <string>
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/thread.h"
#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
#include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/thread.h"
namespace webrtc_jni {
diff --git a/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc b/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc
index e1e5b08..cae9b8f 100644
--- a/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc
+++ b/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc
@@ -20,16 +20,16 @@
#include "third_party/libyuv/include/libyuv/convert.h"
#include "third_party/libyuv/include/libyuv/convert_from.h"
#include "third_party/libyuv/include/libyuv/video_common.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/timeutils.h"
#include "webrtc/common_video/h264/h264_bitstream_parser.h"
#include "webrtc/common_video/include/i420_buffer_pool.h"
#include "webrtc/modules/video_coding/include/video_codec_interface.h"
#include "webrtc/modules/video_coding/utility/vp8_header_parser.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/timeutils.h"
#include "webrtc/sdk/android/src/jni/androidmediacodeccommon.h"
#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
#include "webrtc/sdk/android/src/jni/native_handle_impl.h"
diff --git a/webrtc/sdk/android/src/jni/androidmediaencoder_jni.cc b/webrtc/sdk/android/src/jni/androidmediaencoder_jni.cc
index fe69de4..e5826e1 100644
--- a/webrtc/sdk/android/src/jni/androidmediaencoder_jni.cc
+++ b/webrtc/sdk/android/src/jni/androidmediaencoder_jni.cc
@@ -22,15 +22,6 @@
#include "third_party/libyuv/include/libyuv/convert_from.h"
#include "third_party/libyuv/include/libyuv/video_common.h"
#include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/random.h"
-#include "webrtc/base/sequenced_task_checker.h"
-#include "webrtc/base/task_queue.h"
-#include "webrtc/base/thread.h"
-#include "webrtc/base/timeutils.h"
-#include "webrtc/base/weak_ptr.h"
#include "webrtc/common_types.h"
#include "webrtc/common_video/h264/h264_bitstream_parser.h"
#include "webrtc/common_video/h264/h264_common.h"
@@ -40,6 +31,15 @@
#include "webrtc/modules/video_coding/utility/quality_scaler.h"
#include "webrtc/modules/video_coding/utility/vp8_header_parser.h"
#include "webrtc/modules/video_coding/utility/vp9_uncompressed_header_parser.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/random.h"
+#include "webrtc/rtc_base/sequenced_task_checker.h"
+#include "webrtc/rtc_base/task_queue.h"
+#include "webrtc/rtc_base/thread.h"
+#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/rtc_base/weak_ptr.h"
#include "webrtc/sdk/android/src/jni/androidmediacodeccommon.h"
#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
#include "webrtc/sdk/android/src/jni/native_handle_impl.h"
diff --git a/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.cc b/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.cc
index 4047f79..19f9b30 100644
--- a/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.cc
+++ b/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.cc
@@ -14,11 +14,11 @@
// This was added in Lollipop to dlfcn.h
#define RTLD_NOLOAD 4
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/ipaddress.h"
#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
#include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/ipaddress.h"
namespace webrtc_jni {
diff --git a/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h b/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h
index 0676e0a..f6f22a7 100644
--- a/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h
+++ b/webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h
@@ -11,14 +11,14 @@
#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_JNI_H_
#define WEBRTC_SDK_ANDROID_SRC_JNI_ANDROIDNETWORKMONITOR_JNI_H_
-#include "webrtc/base/networkmonitor.h"
+#include "webrtc/rtc_base/networkmonitor.h"
#include <stdint.h>
#include <map>
+#include "webrtc/rtc_base/thread_checker.h"
#include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/base/thread_checker.h"
namespace webrtc_jni {
diff --git a/webrtc/sdk/android/src/jni/androidvideotracksource.cc b/webrtc/sdk/android/src/jni/androidvideotracksource.cc
index c1431bd..770962d 100644
--- a/webrtc/sdk/android/src/jni/androidvideotracksource.cc
+++ b/webrtc/sdk/android/src/jni/androidvideotracksource.cc
@@ -12,7 +12,7 @@
#include <utility>
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
namespace {
// MediaCodec wants resolution to be divisible by 2.
diff --git a/webrtc/sdk/android/src/jni/androidvideotracksource.h b/webrtc/sdk/android/src/jni/androidvideotracksource.h
index dd4fe97..54741e0 100644
--- a/webrtc/sdk/android/src/jni/androidvideotracksource.h
+++ b/webrtc/sdk/android/src/jni/androidvideotracksource.h
@@ -11,15 +11,15 @@
#ifndef WEBRTC_API_ANDROID_JNI_ANDROIDVIDEOTRACKSOURCE_H_
#define WEBRTC_API_ANDROID_JNI_ANDROIDVIDEOTRACKSOURCE_H_
-#include "webrtc/sdk/android/src/jni/native_handle_impl.h"
-#include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h"
-#include "webrtc/base/asyncinvoker.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/thread_checker.h"
-#include "webrtc/base/timestampaligner.h"
#include "webrtc/common_video/include/i420_buffer_pool.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/media/base/adaptedvideotracksource.h"
+#include "webrtc/rtc_base/asyncinvoker.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/thread_checker.h"
+#include "webrtc/rtc_base/timestampaligner.h"
+#include "webrtc/sdk/android/src/jni/native_handle_impl.h"
+#include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h"
namespace webrtc {
diff --git a/webrtc/sdk/android/src/jni/androidvideotracksource_jni.cc b/webrtc/sdk/android/src/jni/androidvideotracksource_jni.cc
index 519a16d..62f5f82 100644
--- a/webrtc/sdk/android/src/jni/androidvideotracksource_jni.cc
+++ b/webrtc/sdk/android/src/jni/androidvideotracksource_jni.cc
@@ -10,7 +10,7 @@
#include "webrtc/api/video/video_rotation.h"
#include "webrtc/api/videosourceproxy.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/sdk/android/src/jni/androidvideotracksource.h"
#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
diff --git a/webrtc/sdk/android/src/jni/audio_jni.h b/webrtc/sdk/android/src/jni/audio_jni.h
index 3a0b0bd..762d9b8 100644
--- a/webrtc/sdk/android/src/jni/audio_jni.h
+++ b/webrtc/sdk/android/src/jni/audio_jni.h
@@ -15,7 +15,7 @@
// We don't want this target depend on audio related targets
#include "webrtc/api/audio_codecs/audio_decoder_factory.h" // nogncheck
#include "webrtc/api/audio_codecs/audio_encoder_factory.h" // nogncheck
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
namespace webrtc_jni {
diff --git a/webrtc/sdk/android/src/jni/filevideocapturer_jni.cc b/webrtc/sdk/android/src/jni/filevideocapturer_jni.cc
index 9271a79..69d62bc 100644
--- a/webrtc/sdk/android/src/jni/filevideocapturer_jni.cc
+++ b/webrtc/sdk/android/src/jni/filevideocapturer_jni.cc
@@ -11,8 +11,8 @@
#include <jni.h>
#include "third_party/libyuv/include/libyuv/convert_from.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
namespace webrtc_jni {
diff --git a/webrtc/sdk/android/src/jni/jni_helpers.h b/webrtc/sdk/android/src/jni/jni_helpers.h
index bed5683..19b7741 100644
--- a/webrtc/sdk/android/src/jni/jni_helpers.h
+++ b/webrtc/sdk/android/src/jni/jni_helpers.h
@@ -17,9 +17,9 @@
#include <jni.h>
#include <string>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/thread_checker.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/thread_checker.h"
// Abort the process if |jni| has a Java exception pending.
// This macros uses the comma operator to execute ExceptionDescribe
diff --git a/webrtc/sdk/android/src/jni/jni_onload.cc b/webrtc/sdk/android/src/jni/jni_onload.cc
index a57d078..ce71920 100644
--- a/webrtc/sdk/android/src/jni/jni_onload.cc
+++ b/webrtc/sdk/android/src/jni/jni_onload.cc
@@ -12,9 +12,9 @@
#undef JNIEXPORT
#define JNIEXPORT __attribute__((visibility("default")))
+#include "webrtc/rtc_base/ssladapter.h"
#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
#include "webrtc/sdk/android/src/jni/jni_helpers.h"
-#include "webrtc/base/ssladapter.h"
namespace webrtc_jni {
diff --git a/webrtc/sdk/android/src/jni/media_jni.h b/webrtc/sdk/android/src/jni/media_jni.h
index d0e6410..3b26661 100644
--- a/webrtc/sdk/android/src/jni/media_jni.h
+++ b/webrtc/sdk/android/src/jni/media_jni.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_SDK_ANDROID_SRC_JNI_MEDIA_JNI_H_
#define WEBRTC_SDK_ANDROID_SRC_JNI_MEDIA_JNI_H_
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
namespace webrtc {
class AudioDeviceModule;
diff --git a/webrtc/sdk/android/src/jni/native_handle_impl.cc b/webrtc/sdk/android/src/jni/native_handle_impl.cc
index ae4de0b..e2f3c9c 100644
--- a/webrtc/sdk/android/src/jni/native_handle_impl.cc
+++ b/webrtc/sdk/android/src/jni/native_handle_impl.cc
@@ -12,13 +12,13 @@
#include <memory>
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/keep_ref_until_done.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/timeutils.h"
#include "webrtc/common_video/include/video_frame_buffer.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/keep_ref_until_done.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/timeutils.h"
#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
#include "webrtc/sdk/android/src/jni/jni_helpers.h"
#include "webrtc/system_wrappers/include/aligned_malloc.h"
diff --git a/webrtc/sdk/android/src/jni/native_handle_impl.h b/webrtc/sdk/android/src/jni/native_handle_impl.h
index ea83f62..f70ae3b 100644
--- a/webrtc/sdk/android/src/jni/native_handle_impl.h
+++ b/webrtc/sdk/android/src/jni/native_handle_impl.h
@@ -16,7 +16,7 @@
#include "webrtc/api/video/video_frame.h"
#include "webrtc/api/video/video_frame_buffer.h"
#include "webrtc/api/video/video_rotation.h"
-#include "webrtc/base/callback.h"
+#include "webrtc/rtc_base/callback.h"
#include "webrtc/sdk/android/src/jni/jni_helpers.h"
namespace webrtc_jni {
diff --git a/webrtc/sdk/android/src/jni/ownedfactoryandthreads.cc b/webrtc/sdk/android/src/jni/ownedfactoryandthreads.cc
index 7171852..a3aa45c 100644
--- a/webrtc/sdk/android/src/jni/ownedfactoryandthreads.cc
+++ b/webrtc/sdk/android/src/jni/ownedfactoryandthreads.cc
@@ -10,7 +10,7 @@
#include "webrtc/sdk/android/src/jni/ownedfactoryandthreads.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
#include "webrtc/sdk/android/src/jni/jni_helpers.h"
diff --git a/webrtc/sdk/android/src/jni/ownedfactoryandthreads.h b/webrtc/sdk/android/src/jni/ownedfactoryandthreads.h
index 920cb93..eb57316 100644
--- a/webrtc/sdk/android/src/jni/ownedfactoryandthreads.h
+++ b/webrtc/sdk/android/src/jni/ownedfactoryandthreads.h
@@ -16,7 +16,7 @@
#include <utility>
#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/rtc_base/thread.h"
using cricket::WebRtcVideoDecoderFactory;
using cricket::WebRtcVideoEncoderFactory;
diff --git a/webrtc/sdk/android/src/jni/peerconnection_jni.cc b/webrtc/sdk/android/src/jni/peerconnection_jni.cc
index 4fcfb6e..43efd11 100644
--- a/webrtc/sdk/android/src/jni/peerconnection_jni.cc
+++ b/webrtc/sdk/android/src/jni/peerconnection_jni.cc
@@ -48,20 +48,20 @@
#include "webrtc/api/rtpreceiverinterface.h"
#include "webrtc/api/rtpsenderinterface.h"
#include "webrtc/api/videosourceproxy.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/event_tracer.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/logsinks.h"
-#include "webrtc/base/messagequeue.h"
-#include "webrtc/base/networkmonitor.h"
-#include "webrtc/base/rtccertificategenerator.h"
-#include "webrtc/base/ssladapter.h"
-#include "webrtc/base/stringutils.h"
#include "webrtc/media/base/mediaengine.h"
#include "webrtc/media/base/videocapturer.h"
#include "webrtc/modules/utility/include/jvm_android.h"
#include "webrtc/pc/webrtcsdp.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/event_tracer.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/logsinks.h"
+#include "webrtc/rtc_base/messagequeue.h"
+#include "webrtc/rtc_base/networkmonitor.h"
+#include "webrtc/rtc_base/rtccertificategenerator.h"
+#include "webrtc/rtc_base/ssladapter.h"
+#include "webrtc/rtc_base/stringutils.h"
#include "webrtc/sdk/android/src/jni/androidnetworkmonitor_jni.h"
// Adding 'nogncheck' to disable the gn include headers check.
// We don't want to always depend on audio and video related targets.
@@ -1130,8 +1130,8 @@
// talk/ assumes pretty widely that the current Thread is ThreadManager'd, but
// ThreadManager only WrapCurrentThread()s the thread where it is first
// created. Since the semantics around when auto-wrapping happens in
- // webrtc/base/ are convoluted, we simply wrap here to avoid having to think
- // about ramifications of auto-wrapping there.
+ // webrtc/rtc_base/ are convoluted, we simply wrap here to avoid having to
+ // think about ramifications of auto-wrapping there.
rtc::ThreadManager::Instance()->WrapCurrentThread();
webrtc::Trace::CreateTrace();
diff --git a/webrtc/sdk/android/src/jni/surfacetexturehelper_jni.cc b/webrtc/sdk/android/src/jni/surfacetexturehelper_jni.cc
index 81e7ac4..2576f1d 100644
--- a/webrtc/sdk/android/src/jni/surfacetexturehelper_jni.cc
+++ b/webrtc/sdk/android/src/jni/surfacetexturehelper_jni.cc
@@ -11,10 +11,10 @@
#include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
namespace webrtc_jni {
diff --git a/webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h b/webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h
index 07d65c0..084aa33 100644
--- a/webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h
+++ b/webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h
@@ -13,11 +13,11 @@
#include <jni.h>
+#include "webrtc/api/video/video_frame_buffer.h"
+#include "webrtc/rtc_base/refcount.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
#include "webrtc/sdk/android/src/jni/jni_helpers.h"
#include "webrtc/sdk/android/src/jni/native_handle_impl.h"
-#include "webrtc/api/video/video_frame_buffer.h"
-#include "webrtc/base/refcount.h"
-#include "webrtc/base/scoped_ref_ptr.h"
namespace webrtc_jni {
diff --git a/webrtc/sdk/android/src/jni/video_jni.cc b/webrtc/sdk/android/src/jni/video_jni.cc
index 616b2e0..fc6f30c 100644
--- a/webrtc/sdk/android/src/jni/video_jni.cc
+++ b/webrtc/sdk/android/src/jni/video_jni.cc
@@ -11,9 +11,9 @@
#include <jni.h>
#include "webrtc/api/videosourceproxy.h"
-#include "webrtc/base/logging.h"
#include "webrtc/media/engine/webrtcvideodecoderfactory.h"
#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/sdk/android/src/jni/androidmediadecoder_jni.h"
#include "webrtc/sdk/android/src/jni/androidmediaencoder_jni.h"
#include "webrtc/sdk/android/src/jni/androidvideotracksource.h"
diff --git a/webrtc/sdk/android/src/jni/video_jni.h b/webrtc/sdk/android/src/jni/video_jni.h
index c13f33f..09a193f 100644
--- a/webrtc/sdk/android/src/jni/video_jni.h
+++ b/webrtc/sdk/android/src/jni/video_jni.h
@@ -13,7 +13,7 @@
#include <jni.h>
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
namespace cricket {
class WebRtcVideoEncoderFactory;
diff --git a/webrtc/sdk/android/src/jni/videodecoderfactorywrapper.cc b/webrtc/sdk/android/src/jni/videodecoderfactorywrapper.cc
index 1584fd7..678dc3d 100644
--- a/webrtc/sdk/android/src/jni/videodecoderfactorywrapper.cc
+++ b/webrtc/sdk/android/src/jni/videodecoderfactorywrapper.cc
@@ -11,8 +11,8 @@
#include "webrtc/sdk/android/src/jni/videodecoderfactorywrapper.h"
#include "webrtc/api/video_codecs/video_decoder.h"
-#include "webrtc/base/logging.h"
#include "webrtc/common_types.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/sdk/android/src/jni/videodecoderwrapper.h"
namespace webrtc_jni {
diff --git a/webrtc/sdk/android/src/jni/videodecoderwrapper.cc b/webrtc/sdk/android/src/jni/videodecoderwrapper.cc
index e78f395..b822170 100644
--- a/webrtc/sdk/android/src/jni/videodecoderwrapper.cc
+++ b/webrtc/sdk/android/src/jni/videodecoderwrapper.cc
@@ -11,8 +11,8 @@
#include "webrtc/sdk/android/src/jni/videodecoderwrapper.h"
#include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/logging.h"
#include "webrtc/modules/video_coding/include/video_codec_interface.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/sdk/android/src/jni/classreferenceholder.h"
namespace webrtc_jni {
diff --git a/webrtc/sdk/android/src/jni/videofilerenderer_jni.cc b/webrtc/sdk/android/src/jni/videofilerenderer_jni.cc
index 83a089c..42c5991 100644
--- a/webrtc/sdk/android/src/jni/videofilerenderer_jni.cc
+++ b/webrtc/sdk/android/src/jni/videofilerenderer_jni.cc
@@ -11,8 +11,8 @@
#include <jni.h>
#include "third_party/libyuv/include/libyuv/scale.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
namespace webrtc_jni {
diff --git a/webrtc/sdk/android/src/jni/videotrack_jni.cc b/webrtc/sdk/android/src/jni/videotrack_jni.cc
index e35fda1..96ab928 100644
--- a/webrtc/sdk/android/src/jni/videotrack_jni.cc
+++ b/webrtc/sdk/android/src/jni/videotrack_jni.cc
@@ -11,7 +11,7 @@
#include <jni.h>
#include "webrtc/api/mediastreaminterface.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
namespace webrtc_jni {
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel+Private.h b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel+Private.h
index 82e132f..5017c2f 100644
--- a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel+Private.h
+++ b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCDataChannel+Private.h
@@ -11,7 +11,7 @@
#import "WebRTC/RTCDataChannel.h"
#include "webrtc/api/datachannelinterface.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h
index ed18077..1c53e64 100644
--- a/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h
+++ b/webrtc/sdk/objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h
@@ -11,7 +11,7 @@
#import "WebRTC/RTCPeerConnectionFactory.h"
#include "webrtc/api/peerconnectioninterface.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
NS_ASSUME_NONNULL_BEGIN
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.cc b/webrtc/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.cc
index b0a17ff..daebb2c 100644
--- a/webrtc/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.cc
+++ b/webrtc/sdk/objc/Framework/Classes/Video/corevideo_frame_buffer.cc
@@ -12,9 +12,9 @@
#include "libyuv/convert.h"
#include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
namespace webrtc {
diff --git a/webrtc/sdk/objc/Framework/Classes/Video/objcvideotracksource.h b/webrtc/sdk/objc/Framework/Classes/Video/objcvideotracksource.h
index 133c8c6..b28c001 100644
--- a/webrtc/sdk/objc/Framework/Classes/Video/objcvideotracksource.h
+++ b/webrtc/sdk/objc/Framework/Classes/Video/objcvideotracksource.h
@@ -12,8 +12,8 @@
#define WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEO_OBJCVIDEOTRACKSOURCE_H_
#include "WebRTC/RTCMacros.h"
-#include "webrtc/base/timestampaligner.h"
#include "webrtc/media/base/adaptedvideotracksource.h"
+#include "webrtc/rtc_base/timestampaligner.h"
RTC_FWD_DECL_OBJC_CLASS(RTCVideoFrame);
diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/encoder.h b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/encoder.h
index 92cd6b7..c9a4555 100644
--- a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/encoder.h
+++ b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/encoder.h
@@ -13,12 +13,12 @@
#define WEBRTC_SDK_OBJC_FRAMEWORK_CLASSES_VIDEOTOOLBOX_ENCODER_H_
#include "webrtc/api/video/video_rotation.h"
-#include "webrtc/base/criticalsection.h"
#include "webrtc/common_video/h264/h264_bitstream_parser.h"
#include "webrtc/common_video/include/bitrate_adjuster.h"
#include "webrtc/media/base/codec.h"
#include "webrtc/modules/video_coding/codecs/h264/include/h264.h"
#include "webrtc/modules/video_coding/utility/quality_scaler.h"
+#include "webrtc/rtc_base/criticalsection.h"
#include <VideoToolbox/VideoToolbox.h>
#include <vector>
diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.cc b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.cc
index 81f51d8..47afe95 100644
--- a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.cc
+++ b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.cc
@@ -15,8 +15,8 @@
#include <memory>
#include <vector>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
namespace webrtc {
diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h
index 530fbe2..4685f08 100644
--- a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h
+++ b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h
@@ -17,9 +17,9 @@
#include <CoreMedia/CoreMedia.h>
#include <vector>
-#include "webrtc/base/buffer.h"
#include "webrtc/common_video/h264/h264_common.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/buffer.h"
using webrtc::H264::NaluIndex;
diff --git a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter_unittest.cc b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter_unittest.cc
index ba3a3d1..0a680fc 100644
--- a/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter_unittest.cc
+++ b/webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter_unittest.cc
@@ -11,7 +11,7 @@
#include <memory>
-#include "webrtc/base/arraysize.h"
+#include "webrtc/rtc_base/arraysize.h"
#include "webrtc/sdk/objc/Framework/Classes/VideoToolbox/nalu_rewriter.h"
#include "webrtc/test/gtest.h"
diff --git a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h
index 1341a5c..c862d29 100644
--- a/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h
+++ b/webrtc/sdk/objc/Framework/Headers/WebRTC/RTCSSLAdapter.h
@@ -14,7 +14,7 @@
/**
* Initialize and clean up the SSL library. Failure is fatal. These call the
- * corresponding functions in webrtc/base/ssladapter.h.
+ * corresponding functions in webrtc/rtc_base/ssladapter.h.
*/
RTC_EXTERN BOOL RTCInitializeSSL();
RTC_EXTERN BOOL RTCCleanupSSL();
diff --git a/webrtc/stats/rtcstats.cc b/webrtc/stats/rtcstats.cc
index 1968dd0..5d0a937 100644
--- a/webrtc/stats/rtcstats.cc
+++ b/webrtc/stats/rtcstats.cc
@@ -12,7 +12,7 @@
#include <sstream>
-#include "webrtc/base/stringencode.h"
+#include "webrtc/rtc_base/stringencode.h"
namespace webrtc {
diff --git a/webrtc/stats/rtcstats_unittest.cc b/webrtc/stats/rtcstats_unittest.cc
index 6fe8dd9..925a623 100644
--- a/webrtc/stats/rtcstats_unittest.cc
+++ b/webrtc/stats/rtcstats_unittest.cc
@@ -12,8 +12,8 @@
#include <cstring>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/gunit.h"
#include "webrtc/stats/test/rtcteststats.h"
namespace webrtc {
diff --git a/webrtc/stats/rtcstatsreport_unittest.cc b/webrtc/stats/rtcstatsreport_unittest.cc
index 442adbe..25ac3a2 100644
--- a/webrtc/stats/rtcstatsreport_unittest.cc
+++ b/webrtc/stats/rtcstatsreport_unittest.cc
@@ -11,8 +11,8 @@
#include "webrtc/api/stats/rtcstatsreport.h"
#include "webrtc/api/stats/rtcstats.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/gunit.h"
namespace webrtc {
diff --git a/webrtc/system_wrappers/include/aligned_array.h b/webrtc/system_wrappers/include/aligned_array.h
index 71fefea..7cc1c02 100644
--- a/webrtc/system_wrappers/include/aligned_array.h
+++ b/webrtc/system_wrappers/include/aligned_array.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ALIGNED_ARRAY_
#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_ALIGNED_ARRAY_
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
#include "webrtc/system_wrappers/include/aligned_malloc.h"
namespace webrtc {
diff --git a/webrtc/system_wrappers/include/atomic32.h b/webrtc/system_wrappers/include/atomic32.h
index 78e649d..ef3d576 100644
--- a/webrtc/system_wrappers/include/atomic32.h
+++ b/webrtc/system_wrappers/include/atomic32.h
@@ -17,8 +17,8 @@
#include <stddef.h>
-#include "webrtc/base/constructormagic.h"
#include "webrtc/common_types.h"
+#include "webrtc/rtc_base/constructormagic.h"
namespace webrtc {
diff --git a/webrtc/system_wrappers/include/file_wrapper.h b/webrtc/system_wrappers/include/file_wrapper.h
index a1d899c..4fe5899 100644
--- a/webrtc/system_wrappers/include/file_wrapper.h
+++ b/webrtc/system_wrappers/include/file_wrapper.h
@@ -14,8 +14,8 @@
#include <stddef.h>
#include <stdio.h>
-#include "webrtc/base/criticalsection.h"
#include "webrtc/common_types.h"
+#include "webrtc/rtc_base/criticalsection.h"
#include "webrtc/typedefs.h"
// Implementation of an InStream and OutStream that can read (exclusive) or
diff --git a/webrtc/system_wrappers/include/metrics.h b/webrtc/system_wrappers/include/metrics.h
index ca22021..f22cf8f 100644
--- a/webrtc/system_wrappers/include/metrics.h
+++ b/webrtc/system_wrappers/include/metrics.h
@@ -13,9 +13,9 @@
#include <string>
-#include "webrtc/base/atomicops.h"
-#include "webrtc/base/checks.h"
#include "webrtc/common_types.h"
+#include "webrtc/rtc_base/atomicops.h"
+#include "webrtc/rtc_base/checks.h"
// Macros for allowing WebRTC clients (e.g. Chrome) to gather and aggregate
// statistics.
diff --git a/webrtc/system_wrappers/include/rw_lock_wrapper.h b/webrtc/system_wrappers/include/rw_lock_wrapper.h
index 751b6a1..855ecff 100644
--- a/webrtc/system_wrappers/include/rw_lock_wrapper.h
+++ b/webrtc/system_wrappers/include/rw_lock_wrapper.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_SYSTEM_WRAPPERS_INCLUDE_RW_LOCK_WRAPPER_H_
#define WEBRTC_SYSTEM_WRAPPERS_INCLUDE_RW_LOCK_WRAPPER_H_
-#include "webrtc/base/thread_annotations.h"
+#include "webrtc/rtc_base/thread_annotations.h"
// Note, Windows pre-Vista version of RW locks are not supported natively. For
// these OSs regular critical sections have been used to approximate RW lock
diff --git a/webrtc/system_wrappers/include/static_instance.h b/webrtc/system_wrappers/include/static_instance.h
index ad87fe6..f85a912 100644
--- a/webrtc/system_wrappers/include/static_instance.h
+++ b/webrtc/system_wrappers/include/static_instance.h
@@ -13,7 +13,7 @@
#include <assert.h>
-#include "webrtc/base/criticalsection.h"
+#include "webrtc/rtc_base/criticalsection.h"
#ifdef _WIN32
#include "webrtc/system_wrappers/include/fix_interlocked_exchange_pointer_win.h"
#endif
diff --git a/webrtc/system_wrappers/source/clock.cc b/webrtc/system_wrappers/source/clock.cc
index f65adfc..f4533fb 100644
--- a/webrtc/system_wrappers/source/clock.cc
+++ b/webrtc/system_wrappers/source/clock.cc
@@ -12,15 +12,15 @@
#if defined(_WIN32)
// Windows needs to be included before mmsystem.h
-#include "webrtc/base/win32.h"
+#include "webrtc/rtc_base/win32.h"
#include <MMSystem.h>
#elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC))
#include <sys/time.h>
#include <time.h>
#endif
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/timeutils.h"
#include "webrtc/system_wrappers/include/rw_lock_wrapper.h"
namespace webrtc {
diff --git a/webrtc/system_wrappers/source/cpu_info.cc b/webrtc/system_wrappers/source/cpu_info.cc
index 4a61c7a..f151cea 100644
--- a/webrtc/system_wrappers/source/cpu_info.cc
+++ b/webrtc/system_wrappers/source/cpu_info.cc
@@ -23,7 +23,7 @@
#include <sys/sysctl.h>
#endif
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
namespace internal {
static int DetectNumberOfCores() {
diff --git a/webrtc/system_wrappers/source/event.cc b/webrtc/system_wrappers/source/event.cc
index 05f918f..2f08a1a 100644
--- a/webrtc/system_wrappers/source/event.cc
+++ b/webrtc/system_wrappers/source/event.cc
@@ -22,7 +22,7 @@
#include "webrtc/system_wrappers/source/event_timer_posix.h"
#endif
-#include "webrtc/base/event.h"
+#include "webrtc/rtc_base/event.h"
namespace webrtc {
diff --git a/webrtc/system_wrappers/source/event_timer_posix.cc b/webrtc/system_wrappers/source/event_timer_posix.cc
index b46b838..dead7c9 100644
--- a/webrtc/system_wrappers/source/event_timer_posix.cc
+++ b/webrtc/system_wrappers/source/event_timer_posix.cc
@@ -18,7 +18,7 @@
#include <sys/time.h>
#include <unistd.h>
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
diff --git a/webrtc/system_wrappers/source/event_timer_posix.h b/webrtc/system_wrappers/source/event_timer_posix.h
index 599eb55..1b01e4b 100644
--- a/webrtc/system_wrappers/source/event_timer_posix.h
+++ b/webrtc/system_wrappers/source/event_timer_posix.h
@@ -18,7 +18,7 @@
#include <pthread.h>
#include <time.h>
-#include "webrtc/base/platform_thread.h"
+#include "webrtc/rtc_base/platform_thread.h"
namespace webrtc {
diff --git a/webrtc/system_wrappers/source/event_timer_posix_unittest.cc b/webrtc/system_wrappers/source/event_timer_posix_unittest.cc
index f5b3de4..5feac80 100644
--- a/webrtc/system_wrappers/source/event_timer_posix_unittest.cc
+++ b/webrtc/system_wrappers/source/event_timer_posix_unittest.cc
@@ -10,8 +10,8 @@
#include "webrtc/system_wrappers/source/event_timer_posix.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/event.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/event.h"
#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/webrtc/system_wrappers/source/file_impl.cc b/webrtc/system_wrappers/source/file_impl.cc
index 8e1ba24..f62e712 100644
--- a/webrtc/system_wrappers/source/file_impl.cc
+++ b/webrtc/system_wrappers/source/file_impl.cc
@@ -17,7 +17,7 @@
#include <string.h>
#endif
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
namespace {
diff --git a/webrtc/system_wrappers/source/logcat_trace_context.cc b/webrtc/system_wrappers/source/logcat_trace_context.cc
index 3771be5..7ad1b1d 100644
--- a/webrtc/system_wrappers/source/logcat_trace_context.cc
+++ b/webrtc/system_wrappers/source/logcat_trace_context.cc
@@ -13,7 +13,7 @@
#include <android/log.h>
#include <assert.h>
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
namespace webrtc {
diff --git a/webrtc/system_wrappers/source/metrics_default.cc b/webrtc/system_wrappers/source/metrics_default.cc
index 6ca90da..f9a6f6a 100644
--- a/webrtc/system_wrappers/source/metrics_default.cc
+++ b/webrtc/system_wrappers/source/metrics_default.cc
@@ -11,8 +11,8 @@
#include <algorithm>
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/thread_annotations.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/thread_annotations.h"
#include "webrtc/system_wrappers/include/metrics.h"
// Default implementation of histogram methods for WebRTC clients that do not
diff --git a/webrtc/system_wrappers/source/rtp_to_ntp_estimator.cc b/webrtc/system_wrappers/source/rtp_to_ntp_estimator.cc
index baa218d..d65bf98 100644
--- a/webrtc/system_wrappers/source/rtp_to_ntp_estimator.cc
+++ b/webrtc/system_wrappers/source/rtp_to_ntp_estimator.cc
@@ -10,7 +10,7 @@
#include "webrtc/system_wrappers/include/rtp_to_ntp_estimator.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/system_wrappers/include/clock.h"
namespace webrtc {
diff --git a/webrtc/system_wrappers/source/trace_impl.cc b/webrtc/system_wrappers/source/trace_impl.cc
index 30a8816..513327e 100644
--- a/webrtc/system_wrappers/source/trace_impl.cc
+++ b/webrtc/system_wrappers/source/trace_impl.cc
@@ -15,8 +15,8 @@
#include <stdio.h>
#include <string.h>
-#include "webrtc/base/atomicops.h"
-#include "webrtc/base/platform_thread.h"
+#include "webrtc/rtc_base/atomicops.h"
+#include "webrtc/rtc_base/platform_thread.h"
#ifdef _WIN32
#include "webrtc/system_wrappers/source/trace_win.h"
#else
diff --git a/webrtc/system_wrappers/source/trace_impl.h b/webrtc/system_wrappers/source/trace_impl.h
index 045b3cd..90e4a3a 100644
--- a/webrtc/system_wrappers/source/trace_impl.h
+++ b/webrtc/system_wrappers/source/trace_impl.h
@@ -13,11 +13,11 @@
#include <memory>
-#include "webrtc/base/criticalsection.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/platform_thread.h"
#include "webrtc/system_wrappers/include/event_wrapper.h"
#include "webrtc/system_wrappers/include/file_wrapper.h"
#include "webrtc/system_wrappers/include/static_instance.h"
-#include "webrtc/base/platform_thread.h"
#include "webrtc/system_wrappers/include/trace.h"
namespace webrtc {
diff --git a/webrtc/system_wrappers/source/trace_posix.h b/webrtc/system_wrappers/source/trace_posix.h
index 9da7103..4387895 100644
--- a/webrtc/system_wrappers/source/trace_posix.h
+++ b/webrtc/system_wrappers/source/trace_posix.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_POSIX_H_
#define WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_POSIX_H_
-#include "webrtc/base/criticalsection.h"
+#include "webrtc/rtc_base/criticalsection.h"
#include "webrtc/system_wrappers/source/trace_impl.h"
namespace webrtc {
diff --git a/webrtc/test/call_test.cc b/webrtc/test/call_test.cc
index 638e704..fc3fc68 100644
--- a/webrtc/test/call_test.cc
+++ b/webrtc/test/call_test.cc
@@ -14,9 +14,9 @@
#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
#include "webrtc/api/audio_codecs/builtin_audio_encoder_factory.h"
-#include "webrtc/base/checks.h"
#include "webrtc/config.h"
#include "webrtc/modules/audio_mixer/audio_mixer_impl.h"
+#include "webrtc/rtc_base/checks.h"
#include "webrtc/test/testsupport/fileutils.h"
#include "webrtc/voice_engine/include/voe_base.h"
diff --git a/webrtc/test/configurable_frame_size_encoder.cc b/webrtc/test/configurable_frame_size_encoder.cc
index 0cb90a6..c81833f 100644
--- a/webrtc/test/configurable_frame_size_encoder.cc
+++ b/webrtc/test/configurable_frame_size_encoder.cc
@@ -12,9 +12,9 @@
#include <string.h>
-#include "webrtc/base/checks.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"
namespace webrtc {
diff --git a/webrtc/test/direct_transport.h b/webrtc/test/direct_transport.h
index a865c83..8a10b5c 100644
--- a/webrtc/test/direct_transport.h
+++ b/webrtc/test/direct_transport.h
@@ -15,10 +15,10 @@
#include <deque>
#include "webrtc/api/call/transport.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/platform_thread.h"
#include "webrtc/call/call.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/platform_thread.h"
#include "webrtc/test/fake_network_pipe.h"
namespace webrtc {
diff --git a/webrtc/test/drifting_clock.cc b/webrtc/test/drifting_clock.cc
index b110776..c1539fd 100644
--- a/webrtc/test/drifting_clock.cc
+++ b/webrtc/test/drifting_clock.cc
@@ -9,7 +9,7 @@
*/
#include "webrtc/test/drifting_clock.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
namespace test {
diff --git a/webrtc/test/fake_audio_device.cc b/webrtc/test/fake_audio_device.cc
index 91d5978..97299e1 100644
--- a/webrtc/test/fake_audio_device.cc
+++ b/webrtc/test/fake_audio_device.cc
@@ -13,9 +13,9 @@
#include <algorithm>
#include <utility>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/random.h"
#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"
namespace webrtc {
diff --git a/webrtc/test/fake_audio_device.h b/webrtc/test/fake_audio_device.h
index f601744..8b15cd7 100644
--- a/webrtc/test/fake_audio_device.h
+++ b/webrtc/test/fake_audio_device.h
@@ -14,12 +14,12 @@
#include <string>
#include <vector>
-#include "webrtc/base/array_view.h"
-#include "webrtc/base/buffer.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/platform_thread.h"
#include "webrtc/modules/audio_device/include/fake_audio_device.h"
+#include "webrtc/rtc_base/array_view.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"
namespace webrtc {
diff --git a/webrtc/test/fake_decoder.cc b/webrtc/test/fake_decoder.cc
index 25f8077..f2823b5 100644
--- a/webrtc/test/fake_decoder.cc
+++ b/webrtc/test/fake_decoder.cc
@@ -11,7 +11,7 @@
#include "webrtc/test/fake_decoder.h"
#include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/timeutils.h"
#include "webrtc/test/gtest.h"
namespace webrtc {
diff --git a/webrtc/test/fake_encoder.cc b/webrtc/test/fake_encoder.cc
index 922ff56..7c0870e 100644
--- a/webrtc/test/fake_encoder.cc
+++ b/webrtc/test/fake_encoder.cc
@@ -15,9 +15,9 @@
#include <algorithm>
#include <memory>
-#include "webrtc/base/checks.h"
#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"
diff --git a/webrtc/test/fake_encoder.h b/webrtc/test/fake_encoder.h
index 4487c52..220af90 100644
--- a/webrtc/test/fake_encoder.h
+++ b/webrtc/test/fake_encoder.h
@@ -15,10 +15,10 @@
#include <memory>
#include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/sequenced_task_checker.h"
-#include "webrtc/base/task_queue.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"
namespace webrtc {
diff --git a/webrtc/test/fake_network_pipe.cc b/webrtc/test/fake_network_pipe.cc
index a614cc3..bb9d6b1 100644
--- a/webrtc/test/fake_network_pipe.cc
+++ b/webrtc/test/fake_network_pipe.cc
@@ -17,9 +17,9 @@
#include <algorithm>
#include <cmath>
-#include "webrtc/base/logging.h"
#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"
namespace webrtc {
diff --git a/webrtc/test/fake_network_pipe.h b/webrtc/test/fake_network_pipe.h
index f3cd11d..039cc84 100644
--- a/webrtc/test/fake_network_pipe.h
+++ b/webrtc/test/fake_network_pipe.h
@@ -17,10 +17,10 @@
#include <queue>
#include <set>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/random.h"
#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"
namespace webrtc {
diff --git a/webrtc/test/fake_texture_frame.h b/webrtc/test/fake_texture_frame.h
index bcda06d..ce5963e 100644
--- a/webrtc/test/fake_texture_frame.h
+++ b/webrtc/test/fake_texture_frame.h
@@ -12,8 +12,8 @@
#include "webrtc/api/video/i420_buffer.h"
#include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/checks.h"
#include "webrtc/common_video/include/video_frame_buffer.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
namespace test {
diff --git a/webrtc/test/frame_generator.cc b/webrtc/test/frame_generator.cc
index 148488a..52ae14f 100644
--- a/webrtc/test/frame_generator.cc
+++ b/webrtc/test/frame_generator.cc
@@ -16,11 +16,11 @@
#include <memory>
#include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/keep_ref_until_done.h"
-#include "webrtc/base/random.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"
diff --git a/webrtc/test/frame_generator.h b/webrtc/test/frame_generator.h
index 95b0798..6b0137d 100644
--- a/webrtc/test/frame_generator.h
+++ b/webrtc/test/frame_generator.h
@@ -15,8 +15,8 @@
#include <vector>
#include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/criticalsection.h"
#include "webrtc/media/base/videosourceinterface.h"
+#include "webrtc/rtc_base/criticalsection.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/webrtc/test/frame_generator_capturer.cc b/webrtc/test/frame_generator_capturer.cc
index af54f31..73cc5ae 100644
--- a/webrtc/test/frame_generator_capturer.cc
+++ b/webrtc/test/frame_generator_capturer.cc
@@ -13,11 +13,11 @@
#include <utility>
#include <vector>
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/platform_thread.h"
-#include "webrtc/base/task_queue.h"
-#include "webrtc/base/timeutils.h"
+#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/video_send_stream.h"
diff --git a/webrtc/test/frame_generator_capturer.h b/webrtc/test/frame_generator_capturer.h
index 36a79f9..f62afba 100644
--- a/webrtc/test/frame_generator_capturer.h
+++ b/webrtc/test/frame_generator_capturer.h
@@ -14,8 +14,8 @@
#include <string>
#include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/task_queue.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/task_queue.h"
#include "webrtc/test/video_capturer.h"
#include "webrtc/typedefs.h"
diff --git a/webrtc/test/frame_utils.h b/webrtc/test/frame_utils.h
index 8600f43..4953db4 100644
--- a/webrtc/test/frame_utils.h
+++ b/webrtc/test/frame_utils.h
@@ -12,7 +12,7 @@
#include <stdint.h>
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
namespace webrtc {
class I420Buffer;
diff --git a/webrtc/test/fuzzers/audio_decoder_fuzzer.cc b/webrtc/test/fuzzers/audio_decoder_fuzzer.cc
index adc0fc7..ff4478d 100644
--- a/webrtc/test/fuzzers/audio_decoder_fuzzer.cc
+++ b/webrtc/test/fuzzers/audio_decoder_fuzzer.cc
@@ -13,9 +13,9 @@
#include <limits>
#include "webrtc/api/audio_codecs/audio_decoder.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/optional.h"
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/optional.h"
namespace webrtc {
namespace {
diff --git a/webrtc/test/fuzzers/audio_processing_fuzzer.cc b/webrtc/test/fuzzers/audio_processing_fuzzer.cc
index 389ab1c..e31c057 100644
--- a/webrtc/test/fuzzers/audio_processing_fuzzer.cc
+++ b/webrtc/test/fuzzers/audio_processing_fuzzer.cc
@@ -14,9 +14,9 @@
#include <array>
#include <cmath>
-#include "webrtc/base/checks.h"
#include "webrtc/modules/audio_processing/include/audio_processing.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
namespace {
diff --git a/webrtc/test/fuzzers/audio_processing_fuzzer_configs.cc b/webrtc/test/fuzzers/audio_processing_fuzzer_configs.cc
index 9878da9..f9814ec 100644
--- a/webrtc/test/fuzzers/audio_processing_fuzzer_configs.cc
+++ b/webrtc/test/fuzzers/audio_processing_fuzzer_configs.cc
@@ -11,7 +11,7 @@
#include "webrtc/modules/audio_processing/include/audio_processing.h"
#include "webrtc/test/fuzzers/audio_processing_fuzzer.h"
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
namespace webrtc {
diff --git a/webrtc/test/fuzzers/flexfec_header_reader_fuzzer.cc b/webrtc/test/fuzzers/flexfec_header_reader_fuzzer.cc
index a498fd0..f253ca9 100644
--- a/webrtc/test/fuzzers/flexfec_header_reader_fuzzer.cc
+++ b/webrtc/test/fuzzers/flexfec_header_reader_fuzzer.cc
@@ -10,10 +10,10 @@
#include <algorithm>
-#include "webrtc/base/scoped_ref_ptr.h"
#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"
namespace webrtc {
diff --git a/webrtc/test/fuzzers/flexfec_receiver_fuzzer.cc b/webrtc/test/fuzzers/flexfec_receiver_fuzzer.cc
index d38b8a2..b0da803 100644
--- a/webrtc/test/fuzzers/flexfec_receiver_fuzzer.cc
+++ b/webrtc/test/fuzzers/flexfec_receiver_fuzzer.cc
@@ -10,11 +10,11 @@
#include <algorithm>
-#include "webrtc/base/basictypes.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#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"
namespace webrtc {
diff --git a/webrtc/test/fuzzers/neteq_rtp_fuzzer.cc b/webrtc/test/fuzzers/neteq_rtp_fuzzer.cc
index a5a1cde..1a2bfc4 100644
--- a/webrtc/test/fuzzers/neteq_rtp_fuzzer.cc
+++ b/webrtc/test/fuzzers/neteq_rtp_fuzzer.cc
@@ -12,12 +12,12 @@
#include <memory>
#include <vector>
-#include "webrtc/base/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 "webrtc/rtc_base/array_view.h"
namespace webrtc {
namespace test {
diff --git a/webrtc/test/fuzzers/pseudotcp_parser_fuzzer.cc b/webrtc/test/fuzzers/pseudotcp_parser_fuzzer.cc
index 5e4165e..ac5331b 100644
--- a/webrtc/test/fuzzers/pseudotcp_parser_fuzzer.cc
+++ b/webrtc/test/fuzzers/pseudotcp_parser_fuzzer.cc
@@ -11,8 +11,8 @@
#include <stddef.h>
#include <stdint.h>
-#include "webrtc/base/thread.h"
#include "webrtc/p2p/base/pseudotcp.h"
+#include "webrtc/rtc_base/thread.h"
namespace webrtc {
class FakeIPseudoTcpNotify : public cricket::IPseudoTcpNotify {
diff --git a/webrtc/test/fuzzers/residual_echo_detector_fuzzer.cc b/webrtc/test/fuzzers/residual_echo_detector_fuzzer.cc
index ad870af..8250c15 100644
--- a/webrtc/test/fuzzers/residual_echo_detector_fuzzer.cc
+++ b/webrtc/test/fuzzers/residual_echo_detector_fuzzer.cc
@@ -15,8 +15,8 @@
#include <bitset>
#include <vector>
-#include "webrtc/base/checks.h"
#include "webrtc/modules/audio_processing/residual_echo_detector.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
diff --git a/webrtc/test/fuzzers/rtcp_receiver_fuzzer.cc b/webrtc/test/fuzzers/rtcp_receiver_fuzzer.cc
index b8ab9b9..9d93f83 100644
--- a/webrtc/test/fuzzers/rtcp_receiver_fuzzer.cc
+++ b/webrtc/test/fuzzers/rtcp_receiver_fuzzer.cc
@@ -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.
*/
-#include "webrtc/base/checks.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_receiver.h"
+#include "webrtc/rtc_base/checks.h"
#include "webrtc/system_wrappers/include/clock.h"
namespace webrtc {
diff --git a/webrtc/test/fuzzers/transport_feedback_packet_loss_tracker_fuzzer.cc b/webrtc/test/fuzzers/transport_feedback_packet_loss_tracker_fuzzer.cc
index cf19573..2e532d1 100644
--- a/webrtc/test/fuzzers/transport_feedback_packet_loss_tracker_fuzzer.cc
+++ b/webrtc/test/fuzzers/transport_feedback_packet_loss_tracker_fuzzer.cc
@@ -10,10 +10,10 @@
#include <algorithm>
-#include "webrtc/base/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/rtc_base/array_view.h"
#include "webrtc/voice_engine/transport_feedback_packet_loss_tracker.h"
namespace webrtc {
diff --git a/webrtc/test/fuzzers/ulpfec_generator_fuzzer.cc b/webrtc/test/fuzzers/ulpfec_generator_fuzzer.cc
index ce9e30a..01729ef 100644
--- a/webrtc/test/fuzzers/ulpfec_generator_fuzzer.cc
+++ b/webrtc/test/fuzzers/ulpfec_generator_fuzzer.cc
@@ -10,10 +10,10 @@
#include <memory>
-#include "webrtc/base/checks.h"
#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"
namespace webrtc {
diff --git a/webrtc/test/fuzzers/ulpfec_header_reader_fuzzer.cc b/webrtc/test/fuzzers/ulpfec_header_reader_fuzzer.cc
index bcfd9c4..e69f463 100644
--- a/webrtc/test/fuzzers/ulpfec_header_reader_fuzzer.cc
+++ b/webrtc/test/fuzzers/ulpfec_header_reader_fuzzer.cc
@@ -10,10 +10,10 @@
#include <algorithm>
-#include "webrtc/base/scoped_ref_ptr.h"
#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"
namespace webrtc {
diff --git a/webrtc/test/fuzzers/webrtc_fuzzer_main.cc b/webrtc/test/fuzzers/webrtc_fuzzer_main.cc
index 50a513c..a5d5ed1 100644
--- a/webrtc/test/fuzzers/webrtc_fuzzer_main.cc
+++ b/webrtc/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/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
namespace {
bool g_initialized = false;
diff --git a/webrtc/test/gl/gl_renderer.cc b/webrtc/test/gl/gl_renderer.cc
index 5f52923..c55f347 100644
--- a/webrtc/test/gl/gl_renderer.cc
+++ b/webrtc/test/gl/gl_renderer.cc
@@ -12,8 +12,8 @@
#include <string.h>
-#include "webrtc/base/checks.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
namespace test {
diff --git a/webrtc/test/gmock.h b/webrtc/test/gmock.h
index bc12fb9..8e321a0 100644
--- a/webrtc/test/gmock.h
+++ b/webrtc/test/gmock.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_TEST_GMOCK_H_
#define WEBRTC_TEST_GMOCK_H_
-#include "webrtc/base/ignore_wundef.h"
+#include "webrtc/rtc_base/ignore_wundef.h"
RTC_PUSH_IGNORING_WUNDEF()
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/webrtc/test/gtest.h b/webrtc/test/gtest.h
index 2d222cc..886e7b8 100644
--- a/webrtc/test/gtest.h
+++ b/webrtc/test/gtest.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_TEST_GTEST_H_
#define WEBRTC_TEST_GTEST_H_
-#include "webrtc/base/ignore_wundef.h"
+#include "webrtc/rtc_base/ignore_wundef.h"
RTC_PUSH_IGNORING_WUNDEF()
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/webrtc/test/layer_filtering_transport.cc b/webrtc/test/layer_filtering_transport.cc
index 06fc71f..00fe5f9 100644
--- a/webrtc/test/layer_filtering_transport.cc
+++ b/webrtc/test/layer_filtering_transport.cc
@@ -10,11 +10,11 @@
#include <memory>
-#include "webrtc/base/checks.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_format.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
+#include "webrtc/rtc_base/checks.h"
#include "webrtc/test/layer_filtering_transport.h"
namespace webrtc {
diff --git a/webrtc/test/mac/video_renderer_mac.h b/webrtc/test/mac/video_renderer_mac.h
index 702f5ae..2d55163 100644
--- a/webrtc/test/mac/video_renderer_mac.h
+++ b/webrtc/test/mac/video_renderer_mac.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_TEST_MAC_VIDEO_RENDERER_MAC_H_
#define WEBRTC_TEST_MAC_VIDEO_RENDERER_MAC_H_
-#include "webrtc/base/constructormagic.h"
+#include "webrtc/rtc_base/constructormagic.h"
#include "webrtc/test/gl/gl_renderer.h"
@class CocoaWindow;
diff --git a/webrtc/test/mock_audio_decoder_factory.h b/webrtc/test/mock_audio_decoder_factory.h
index 24eb44e..ae7cc42 100644
--- a/webrtc/test/mock_audio_decoder_factory.h
+++ b/webrtc/test/mock_audio_decoder_factory.h
@@ -16,7 +16,7 @@
#include "webrtc/api/audio_codecs/audio_decoder_factory.h"
#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
#include "webrtc/test/gmock.h"
namespace webrtc {
diff --git a/webrtc/test/mock_audio_encoder.h b/webrtc/test/mock_audio_encoder.h
index 1c6a5f0..90e2b9d 100644
--- a/webrtc/test/mock_audio_encoder.h
+++ b/webrtc/test/mock_audio_encoder.h
@@ -14,7 +14,7 @@
#include <string>
#include "webrtc/api/audio_codecs/audio_encoder.h"
-#include "webrtc/base/array_view.h"
+#include "webrtc/rtc_base/array_view.h"
#include "webrtc/test/gmock.h"
namespace webrtc {
diff --git a/webrtc/test/mock_audio_encoder_factory.h b/webrtc/test/mock_audio_encoder_factory.h
index 41494a2..c095197 100644
--- a/webrtc/test/mock_audio_encoder_factory.h
+++ b/webrtc/test/mock_audio_encoder_factory.h
@@ -15,7 +15,7 @@
#include <vector>
#include "webrtc/api/audio_codecs/audio_encoder_factory.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
#include "webrtc/test/gmock.h"
namespace webrtc {
diff --git a/webrtc/test/rtcp_packet_parser.cc b/webrtc/test/rtcp_packet_parser.cc
index 728cb63..ad90ce6 100644
--- a/webrtc/test/rtcp_packet_parser.cc
+++ b/webrtc/test/rtcp_packet_parser.cc
@@ -8,9 +8,9 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
#include "webrtc/test/rtcp_packet_parser.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
namespace webrtc {
namespace test {
diff --git a/webrtc/test/rtcp_packet_parser.h b/webrtc/test/rtcp_packet_parser.h
index 5dc4e84..4bc5477 100644
--- a/webrtc/test/rtcp_packet_parser.h
+++ b/webrtc/test/rtcp_packet_parser.h
@@ -12,8 +12,6 @@
#ifndef WEBRTC_TEST_RTCP_PACKET_PARSER_H_
#define WEBRTC_TEST_RTCP_PACKET_PARSER_H_
-#include "webrtc/base/array_view.h"
-#include "webrtc/base/checks.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"
@@ -30,6 +28,8 @@
#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/array_view.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
namespace test {
diff --git a/webrtc/test/rtp_file_reader.cc b/webrtc/test/rtp_file_reader.cc
index c4fd42d..36ad33a 100644
--- a/webrtc/test/rtp_file_reader.cc
+++ b/webrtc/test/rtp_file_reader.cc
@@ -16,11 +16,11 @@
#include <string>
#include <vector>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/format_macros.h"
-#include "webrtc/base/logging.h"
#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"
namespace webrtc {
namespace test {
diff --git a/webrtc/test/rtp_file_writer.cc b/webrtc/test/rtp_file_writer.cc
index d9e0586..596c234 100644
--- a/webrtc/test/rtp_file_writer.cc
+++ b/webrtc/test/rtp_file_writer.cc
@@ -14,8 +14,8 @@
#include <string>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/constructormagic.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
namespace webrtc {
namespace test {
diff --git a/webrtc/test/rtp_rtcp_observer.h b/webrtc/test/rtp_rtcp_observer.h
index bb00782..54db770 100644
--- a/webrtc/test/rtp_rtcp_observer.h
+++ b/webrtc/test/rtp_rtcp_observer.h
@@ -14,9 +14,9 @@
#include <memory>
#include <vector>
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/event.h"
#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"
diff --git a/webrtc/test/test_main.cc b/webrtc/test/test_main.cc
index ac8261e..2d7dbe2 100644
--- a/webrtc/test/test_main.cc
+++ b/webrtc/test/test_main.cc
@@ -9,7 +9,7 @@
*/
#include "gflags/gflags.h"
-#include "webrtc/base/logging.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"
diff --git a/webrtc/test/testsupport/fileutils.cc b/webrtc/test/testsupport/fileutils.cc
index a96b1ea..deb9cf0 100644
--- a/webrtc/test/testsupport/fileutils.cc
+++ b/webrtc/test/testsupport/fileutils.cc
@@ -21,7 +21,7 @@
#include "Shlwapi.h"
#include "WinDef.h"
-#include "webrtc/base/win32.h"
+#include "webrtc/rtc_base/win32.h"
#define GET_CURRENT_DIR _getcwd
#else
#include <dirent.h>
@@ -42,7 +42,7 @@
#include <memory>
#include <utility>
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
#include "webrtc/typedefs.h" // For architecture defines
namespace webrtc {
diff --git a/webrtc/test/testsupport/fileutils.h b/webrtc/test/testsupport/fileutils.h
index 434287d..570d7b4 100644
--- a/webrtc/test/testsupport/fileutils.h
+++ b/webrtc/test/testsupport/fileutils.h
@@ -16,7 +16,7 @@
#include <string>
#include <vector>
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
namespace webrtc {
namespace test {
diff --git a/webrtc/test/testsupport/fileutils_unittest.cc b/webrtc/test/testsupport/fileutils_unittest.cc
index 560300f..bdabb84 100644
--- a/webrtc/test/testsupport/fileutils_unittest.cc
+++ b/webrtc/test/testsupport/fileutils_unittest.cc
@@ -17,9 +17,9 @@
#include <list>
#include <string>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/pathutils.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/pathutils.h"
#include "webrtc/test/gtest.h"
#ifdef WIN32
diff --git a/webrtc/test/testsupport/frame_reader.h b/webrtc/test/testsupport/frame_reader.h
index 94dd78b..a8fe73f 100644
--- a/webrtc/test/testsupport/frame_reader.h
+++ b/webrtc/test/testsupport/frame_reader.h
@@ -15,7 +15,7 @@
#include <string>
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/webrtc/test/testsupport/isolated_output.cc b/webrtc/test/testsupport/isolated_output.cc
index 26e9f55..5324900 100644
--- a/webrtc/test/testsupport/isolated_output.cc
+++ b/webrtc/test/testsupport/isolated_output.cc
@@ -13,9 +13,9 @@
#include <string.h>
#include "gflags/gflags.h"
-#include "webrtc/base/file.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/pathutils.h"
+#include "webrtc/rtc_base/file.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/pathutils.h"
#include "webrtc/test/testsupport/fileutils.h"
DEFINE_string(isolated_out_dir, webrtc::test::OutputPath(),
diff --git a/webrtc/test/testsupport/isolated_output_unittest.cc b/webrtc/test/testsupport/isolated_output_unittest.cc
index 0918554..bb75ebf 100644
--- a/webrtc/test/testsupport/isolated_output_unittest.cc
+++ b/webrtc/test/testsupport/isolated_output_unittest.cc
@@ -15,9 +15,9 @@
#include <string>
#include "gflags/gflags.h"
-#include "webrtc/base/file.h"
-#include "webrtc/base/pathutils.h"
-#include "webrtc/base/platform_file.h"
+#include "webrtc/rtc_base/file.h"
+#include "webrtc/rtc_base/pathutils.h"
+#include "webrtc/rtc_base/platform_file.h"
#include "webrtc/test/gtest.h"
DECLARE_string(isolated_out_dir);
diff --git a/webrtc/test/testsupport/y4m_frame_writer.cc b/webrtc/test/testsupport/y4m_frame_writer.cc
index 28fb4b0..e338982 100644
--- a/webrtc/test/testsupport/y4m_frame_writer.cc
+++ b/webrtc/test/testsupport/y4m_frame_writer.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
#include "webrtc/test/testsupport/frame_writer.h"
namespace webrtc {
diff --git a/webrtc/test/testsupport/yuv_frame_writer.cc b/webrtc/test/testsupport/yuv_frame_writer.cc
index 3c00761..84fba7e 100644
--- a/webrtc/test/testsupport/yuv_frame_writer.cc
+++ b/webrtc/test/testsupport/yuv_frame_writer.cc
@@ -8,7 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
#include "webrtc/test/testsupport/frame_writer.h"
namespace webrtc {
diff --git a/webrtc/test/vcm_capturer.cc b/webrtc/test/vcm_capturer.cc
index 6418641..85cf0cd 100644
--- a/webrtc/test/vcm_capturer.cc
+++ b/webrtc/test/vcm_capturer.cc
@@ -10,8 +10,8 @@
#include "webrtc/test/vcm_capturer.h"
-#include "webrtc/base/logging.h"
#include "webrtc/modules/video_capture/video_capture_factory.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/video_send_stream.h"
namespace webrtc {
namespace test {
diff --git a/webrtc/test/vcm_capturer.h b/webrtc/test/vcm_capturer.h
index 08e8444..fdb594b 100644
--- a/webrtc/test/vcm_capturer.h
+++ b/webrtc/test/vcm_capturer.h
@@ -12,11 +12,11 @@
#include <memory>
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/scoped_ref_ptr.h"
#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"
namespace webrtc {
diff --git a/webrtc/test/video_capturer.cc b/webrtc/test/video_capturer.cc
index d0b5c37..cb75fa2 100644
--- a/webrtc/test/video_capturer.cc
+++ b/webrtc/test/video_capturer.cc
@@ -10,8 +10,8 @@
#include "webrtc/test/video_capturer.h"
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/constructormagic.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/constructormagic.h"
namespace webrtc {
namespace test {
diff --git a/webrtc/test/video_capturer.h b/webrtc/test/video_capturer.h
index 667d89c8..2535370 100644
--- a/webrtc/test/video_capturer.h
+++ b/webrtc/test/video_capturer.h
@@ -16,10 +16,10 @@
#include "webrtc/api/video/i420_buffer.h"
#include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/optional.h"
#include "webrtc/media/base/videoadapter.h"
#include "webrtc/media/base/videosourceinterface.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/optional.h"
namespace cricket {
class VideoAdapter;
diff --git a/webrtc/test/win/d3d_renderer.cc b/webrtc/test/win/d3d_renderer.cc
index 01b0325..e73bad6 100644
--- a/webrtc/test/win/d3d_renderer.cc
+++ b/webrtc/test/win/d3d_renderer.cc
@@ -9,8 +9,8 @@
*/
#include "webrtc/test/win/d3d_renderer.h"
-#include "webrtc/base/checks.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
namespace test {
diff --git a/webrtc/test/win/d3d_renderer.h b/webrtc/test/win/d3d_renderer.h
index 575d9c7..c3e9f7d 100644
--- a/webrtc/test/win/d3d_renderer.h
+++ b/webrtc/test/win/d3d_renderer.h
@@ -14,7 +14,7 @@
#include <d3d9.h>
#pragma comment(lib, "d3d9.lib") // located in DirectX SDK
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
#include "webrtc/test/video_renderer.h"
#include "webrtc/typedefs.h"
diff --git a/webrtc/video/call_stats.cc b/webrtc/video/call_stats.cc
index f772037..9864d4e 100644
--- a/webrtc/video/call_stats.cc
+++ b/webrtc/video/call_stats.cc
@@ -12,9 +12,9 @@
#include <algorithm>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/constructormagic.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
#include "webrtc/system_wrappers/include/metrics.h"
namespace webrtc {
diff --git a/webrtc/video/call_stats.h b/webrtc/video/call_stats.h
index 9a5967e..a9b4280 100644
--- a/webrtc/video/call_stats.h
+++ b/webrtc/video/call_stats.h
@@ -14,9 +14,9 @@
#include <list>
#include <memory>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
#include "webrtc/modules/include/module.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/criticalsection.h"
#include "webrtc/system_wrappers/include/clock.h"
namespace webrtc {
diff --git a/webrtc/video/encoder_rtcp_feedback.cc b/webrtc/video/encoder_rtcp_feedback.cc
index b6f3fc9..11d46ff 100644
--- a/webrtc/video/encoder_rtcp_feedback.cc
+++ b/webrtc/video/encoder_rtcp_feedback.cc
@@ -10,7 +10,7 @@
#include "webrtc/video/encoder_rtcp_feedback.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
#include "webrtc/video/vie_encoder.h"
static const int kMinKeyFrameRequestIntervalMs = 300;
diff --git a/webrtc/video/encoder_rtcp_feedback.h b/webrtc/video/encoder_rtcp_feedback.h
index 06548d6..e7a825c 100644
--- a/webrtc/video/encoder_rtcp_feedback.h
+++ b/webrtc/video/encoder_rtcp_feedback.h
@@ -12,8 +12,8 @@
#include <vector>
-#include "webrtc/base/criticalsection.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "webrtc/rtc_base/criticalsection.h"
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/typedefs.h"
diff --git a/webrtc/video/end_to_end_tests.cc b/webrtc/video/end_to_end_tests.cc
index 0d7662d..2b67c85 100644
--- a/webrtc/video/end_to_end_tests.cc
+++ b/webrtc/video/end_to_end_tests.cc
@@ -16,12 +16,6 @@
#include <vector>
#include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/file.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/random.h"
-#include "webrtc/base/rate_limiter.h"
#include "webrtc/call/call.h"
#include "webrtc/common_video/include/frame_callback.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
@@ -41,6 +35,12 @@
#include "webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.h"
#include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
#include "webrtc/modules/video_coding/include/video_coding_defines.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/file.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/random.h"
+#include "webrtc/rtc_base/rate_limiter.h"
#include "webrtc/system_wrappers/include/metrics.h"
#include "webrtc/system_wrappers/include/metrics_default.h"
#include "webrtc/system_wrappers/include/sleep.h"
diff --git a/webrtc/video/overuse_frame_detector.cc b/webrtc/video/overuse_frame_detector.cc
index 9711ddb..1d8bc0b 100644
--- a/webrtc/video/overuse_frame_detector.cc
+++ b/webrtc/video/overuse_frame_detector.cc
@@ -20,11 +20,11 @@
#include <utility>
#include "webrtc/api/video/video_frame.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/numerics/exp_filter.h"
-#include "webrtc/base/timeutils.h"
#include "webrtc/common_video/include/frame_callback.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/numerics/exp_filter.h"
+#include "webrtc/rtc_base/timeutils.h"
#include "webrtc/system_wrappers/include/field_trial.h"
#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
diff --git a/webrtc/video/overuse_frame_detector.h b/webrtc/video/overuse_frame_detector.h
index 29efa16..8bf1a78 100644
--- a/webrtc/video/overuse_frame_detector.h
+++ b/webrtc/video/overuse_frame_detector.h
@@ -14,13 +14,13 @@
#include <list>
#include <memory>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/numerics/exp_filter.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/sequenced_task_checker.h"
-#include "webrtc/base/task_queue.h"
-#include "webrtc/base/thread_annotations.h"
#include "webrtc/modules/video_coding/utility/quality_scaler.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/numerics/exp_filter.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/sequenced_task_checker.h"
+#include "webrtc/rtc_base/task_queue.h"
+#include "webrtc/rtc_base/thread_annotations.h"
namespace webrtc {
diff --git a/webrtc/video/overuse_frame_detector_unittest.cc b/webrtc/video/overuse_frame_detector_unittest.cc
index ae3b687..e52efcb 100644
--- a/webrtc/video/overuse_frame_detector_unittest.cc
+++ b/webrtc/video/overuse_frame_detector_unittest.cc
@@ -11,13 +11,13 @@
#include <memory>
#include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/fakeclock.h"
#include "webrtc/common_video/include/video_frame.h"
+#include "webrtc/modules/video_coding/utility/quality_scaler.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/fakeclock.h"
#include "webrtc/test/gmock.h"
#include "webrtc/test/gtest.h"
#include "webrtc/video/overuse_frame_detector.h"
-#include "webrtc/modules/video_coding/utility/quality_scaler.h"
namespace webrtc {
diff --git a/webrtc/video/payload_router.cc b/webrtc/video/payload_router.cc
index e0e95ae..973cf5c 100644
--- a/webrtc/video/payload_router.cc
+++ b/webrtc/video/payload_router.cc
@@ -10,10 +10,10 @@
#include "webrtc/video/payload_router.h"
-#include "webrtc/base/checks.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "webrtc/modules/video_coding/include/video_codec_interface.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
diff --git a/webrtc/video/payload_router.h b/webrtc/video/payload_router.h
index bcf1d9b..177bc07 100644
--- a/webrtc/video/payload_router.h
+++ b/webrtc/video/payload_router.h
@@ -14,11 +14,11 @@
#include <vector>
#include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/thread_annotations.h"
#include "webrtc/common_types.h"
#include "webrtc/config.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/thread_annotations.h"
#include "webrtc/system_wrappers/include/atomic32.h"
namespace webrtc {
diff --git a/webrtc/video/quality_threshold.cc b/webrtc/video/quality_threshold.cc
index c1d3b10..370fe6b 100644
--- a/webrtc/video/quality_threshold.cc
+++ b/webrtc/video/quality_threshold.cc
@@ -10,8 +10,8 @@
#include "webrtc/video/quality_threshold.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
namespace webrtc {
diff --git a/webrtc/video/quality_threshold.h b/webrtc/video/quality_threshold.h
index 95e11d2..ee13f8b 100644
--- a/webrtc/video/quality_threshold.h
+++ b/webrtc/video/quality_threshold.h
@@ -13,7 +13,7 @@
#include <memory>
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
namespace webrtc {
diff --git a/webrtc/video/receive_statistics_proxy.cc b/webrtc/video/receive_statistics_proxy.cc
index 61b2ad1..4c8be13 100644
--- a/webrtc/video/receive_statistics_proxy.cc
+++ b/webrtc/video/receive_statistics_proxy.cc
@@ -14,10 +14,10 @@
#include <cmath>
#include <utility>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/trace_event.h"
#include "webrtc/modules/video_coding/include/video_codec_interface.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/trace_event.h"
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/system_wrappers/include/field_trial.h"
#include "webrtc/system_wrappers/include/metrics.h"
diff --git a/webrtc/video/receive_statistics_proxy.h b/webrtc/video/receive_statistics_proxy.h
index e1d0971..5e269fe 100644
--- a/webrtc/video/receive_statistics_proxy.h
+++ b/webrtc/video/receive_statistics_proxy.h
@@ -14,13 +14,13 @@
#include <map>
#include <string>
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/rate_statistics.h"
-#include "webrtc/base/ratetracker.h"
-#include "webrtc/base/thread_annotations.h"
#include "webrtc/common_types.h"
#include "webrtc/common_video/include/frame_callback.h"
#include "webrtc/modules/video_coding/include/video_coding_defines.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/rate_statistics.h"
+#include "webrtc/rtc_base/ratetracker.h"
+#include "webrtc/rtc_base/thread_annotations.h"
#include "webrtc/video/quality_threshold.h"
#include "webrtc/video/report_block_stats.h"
#include "webrtc/video/stats_counter.h"
diff --git a/webrtc/video/replay.cc b/webrtc/video/replay.cc
index 6f4ce67..208d70a 100644
--- a/webrtc/video/replay.cc
+++ b/webrtc/video/replay.cc
@@ -16,11 +16,11 @@
#include "gflags/gflags.h"
#include "webrtc/api/video_codecs/video_decoder.h"
-#include "webrtc/base/checks.h"
#include "webrtc/call/call.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
+#include "webrtc/rtc_base/checks.h"
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/system_wrappers/include/sleep.h"
#include "webrtc/test/encoder_settings.h"
diff --git a/webrtc/video/rtp_streams_synchronizer.cc b/webrtc/video/rtp_streams_synchronizer.cc
index 1edb9b8..ad7cf42 100644
--- a/webrtc/video/rtp_streams_synchronizer.cc
+++ b/webrtc/video/rtp_streams_synchronizer.cc
@@ -10,12 +10,12 @@
#include "webrtc/video/rtp_streams_synchronizer.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/timeutils.h"
-#include "webrtc/base/trace_event.h"
#include "webrtc/call/syncable.h"
#include "webrtc/modules/video_coding/video_coding_impl.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/rtc_base/trace_event.h"
namespace webrtc {
namespace {
diff --git a/webrtc/video/rtp_streams_synchronizer.h b/webrtc/video/rtp_streams_synchronizer.h
index afa1501..dfc0ddb 100644
--- a/webrtc/video/rtp_streams_synchronizer.h
+++ b/webrtc/video/rtp_streams_synchronizer.h
@@ -16,9 +16,9 @@
#include <memory>
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/thread_checker.h"
#include "webrtc/modules/include/module.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/thread_checker.h"
#include "webrtc/video/stream_synchronization.h"
namespace webrtc {
diff --git a/webrtc/video/rtp_video_stream_receiver.cc b/webrtc/video/rtp_video_stream_receiver.cc
index 6b8ea0f..4204670 100644
--- a/webrtc/video/rtp_video_stream_receiver.cc
+++ b/webrtc/video/rtp_video_stream_receiver.cc
@@ -13,9 +13,6 @@
#include <utility>
#include <vector>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/location.h"
-#include "webrtc/base/logging.h"
#include "webrtc/common_types.h"
#include "webrtc/config.h"
#include "webrtc/media/base/mediaconstants.h"
@@ -34,6 +31,9 @@
#include "webrtc/modules/video_coding/h264_sps_pps_tracker.h"
#include "webrtc/modules/video_coding/packet_buffer.h"
#include "webrtc/modules/video_coding/video_coding_impl.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/location.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/system_wrappers/include/field_trial.h"
#include "webrtc/system_wrappers/include/metrics.h"
#include "webrtc/system_wrappers/include/timestamp_extrapolator.h"
diff --git a/webrtc/video/rtp_video_stream_receiver.h b/webrtc/video/rtp_video_stream_receiver.h
index 924f1be..afcc696 100644
--- a/webrtc/video/rtp_video_stream_receiver.h
+++ b/webrtc/video/rtp_video_stream_receiver.h
@@ -17,8 +17,6 @@
#include <string>
#include <vector>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
#include "webrtc/call/rtp_packet_sink_interface.h"
#include "webrtc/modules/include/module_common_types.h"
#include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
@@ -31,6 +29,8 @@
#include "webrtc/modules/video_coding/packet_buffer.h"
#include "webrtc/modules/video_coding/rtp_frame_reference_finder.h"
#include "webrtc/modules/video_coding/sequence_number_util.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/criticalsection.h"
#include "webrtc/typedefs.h"
#include "webrtc/video_receive_stream.h"
diff --git a/webrtc/video/rtp_video_stream_receiver_unittest.cc b/webrtc/video/rtp_video_stream_receiver_unittest.cc
index 8f42fbd..3e94e53 100644
--- a/webrtc/video/rtp_video_stream_receiver_unittest.cc
+++ b/webrtc/video/rtp_video_stream_receiver_unittest.cc
@@ -11,17 +11,17 @@
#include "webrtc/test/gtest.h"
#include "webrtc/test/gmock.h"
-#include "webrtc/base/bytebuffer.h"
-#include "webrtc/base/logging.h"
#include "webrtc/common_video/h264/h264_common.h"
#include "webrtc/media/base/mediaconstants.h"
#include "webrtc/modules/pacing/packet_router.h"
-#include "webrtc/modules/video_coding/include/video_coding_defines.h"
+#include "webrtc/modules/utility/include/process_thread.h"
#include "webrtc/modules/video_coding/frame_object.h"
+#include "webrtc/modules/video_coding/include/video_coding_defines.h"
#include "webrtc/modules/video_coding/packet.h"
#include "webrtc/modules/video_coding/rtp_frame_reference_finder.h"
#include "webrtc/modules/video_coding/timing.h"
-#include "webrtc/modules/utility/include/process_thread.h"
+#include "webrtc/rtc_base/bytebuffer.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/system_wrappers/include/field_trial_default.h"
#include "webrtc/test/field_trial.h"
diff --git a/webrtc/video/screenshare_loopback.cc b/webrtc/video/screenshare_loopback.cc
index 4212f35..01dee91 100644
--- a/webrtc/video/screenshare_loopback.cc
+++ b/webrtc/video/screenshare_loopback.cc
@@ -10,8 +10,8 @@
#include <stdio.h>
-#include "webrtc/base/flags.h"
-#include "webrtc/base/stringencode.h"
+#include "webrtc/rtc_base/flags.h"
+#include "webrtc/rtc_base/stringencode.h"
#include "webrtc/test/field_trial.h"
#include "webrtc/test/gtest.h"
#include "webrtc/test/run_test.h"
diff --git a/webrtc/video/send_delay_stats.cc b/webrtc/video/send_delay_stats.cc
index 1c3fd2a..b7c6658 100644
--- a/webrtc/video/send_delay_stats.cc
+++ b/webrtc/video/send_delay_stats.cc
@@ -12,7 +12,7 @@
#include <utility>
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/system_wrappers/include/metrics.h"
namespace webrtc {
diff --git a/webrtc/video/send_delay_stats.h b/webrtc/video/send_delay_stats.h
index 8cac123..658cf2b 100644
--- a/webrtc/video/send_delay_stats.h
+++ b/webrtc/video/send_delay_stats.h
@@ -15,10 +15,10 @@
#include <memory>
#include <set>
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/thread_annotations.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/thread_annotations.h"
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/video/stats_counter.h"
#include "webrtc/video_send_stream.h"
diff --git a/webrtc/video/send_statistics_proxy.cc b/webrtc/video/send_statistics_proxy.cc
index cea9ce7..898bedc 100644
--- a/webrtc/video/send_statistics_proxy.cc
+++ b/webrtc/video/send_statistics_proxy.cc
@@ -15,11 +15,11 @@
#include <map>
#include <vector>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/trace_event.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/video_coding/include/video_codec_interface.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/trace_event.h"
#include "webrtc/system_wrappers/include/metrics.h"
namespace webrtc {
diff --git a/webrtc/video/send_statistics_proxy.h b/webrtc/video/send_statistics_proxy.h
index 763a7a8..5017598 100644
--- a/webrtc/video/send_statistics_proxy.h
+++ b/webrtc/video/send_statistics_proxy.h
@@ -16,13 +16,13 @@
#include <string>
#include <vector>
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/numerics/exp_filter.h"
-#include "webrtc/base/ratetracker.h"
-#include "webrtc/base/thread_annotations.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/video_coding/include/video_codec_interface.h"
#include "webrtc/modules/video_coding/include/video_coding_defines.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/numerics/exp_filter.h"
+#include "webrtc/rtc_base/ratetracker.h"
+#include "webrtc/rtc_base/thread_annotations.h"
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/video/overuse_frame_detector.h"
#include "webrtc/video/report_block_stats.h"
diff --git a/webrtc/video/stats_counter.cc b/webrtc/video/stats_counter.cc
index da7a706..adc0129 100644
--- a/webrtc/video/stats_counter.cc
+++ b/webrtc/video/stats_counter.cc
@@ -14,7 +14,7 @@
#include <limits>
#include <map>
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
#include "webrtc/system_wrappers/include/clock.h"
namespace webrtc {
diff --git a/webrtc/video/stats_counter.h b/webrtc/video/stats_counter.h
index 4fa676c..4beb5bf 100644
--- a/webrtc/video/stats_counter.h
+++ b/webrtc/video/stats_counter.h
@@ -14,7 +14,7 @@
#include <memory>
#include <string>
-#include "webrtc/base/constructormagic.h"
+#include "webrtc/rtc_base/constructormagic.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/webrtc/video/stream_synchronization.cc b/webrtc/video/stream_synchronization.cc
index 32a2d72..fc9ab32 100644
--- a/webrtc/video/stream_synchronization.cc
+++ b/webrtc/video/stream_synchronization.cc
@@ -16,7 +16,7 @@
#include <algorithm>
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/logging.h"
namespace webrtc {
diff --git a/webrtc/video/transport_adapter.cc b/webrtc/video/transport_adapter.cc
index 6f4e028..4f4dd98 100644
--- a/webrtc/video/transport_adapter.cc
+++ b/webrtc/video/transport_adapter.cc
@@ -10,7 +10,7 @@
#include "webrtc/video/transport_adapter.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
namespace internal {
diff --git a/webrtc/video/video_loopback.cc b/webrtc/video/video_loopback.cc
index dc8de56..aa11005 100644
--- a/webrtc/video/video_loopback.cc
+++ b/webrtc/video/video_loopback.cc
@@ -10,7 +10,7 @@
#include <stdio.h>
-#include "webrtc/base/flags.h"
+#include "webrtc/rtc_base/flags.h"
#include "webrtc/test/field_trial.h"
#include "webrtc/test/gtest.h"
#include "webrtc/test/run_test.h"
diff --git a/webrtc/video/video_quality_test.cc b/webrtc/video/video_quality_test.cc
index 5e99b50..d544603 100644
--- a/webrtc/video/video_quality_test.cc
+++ b/webrtc/video/video_quality_test.cc
@@ -18,14 +18,6 @@
#include <string>
#include <vector>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/cpu_time.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/format_macros.h"
-#include "webrtc/base/memory_usage.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/platform_file.h"
-#include "webrtc/base/timeutils.h"
#include "webrtc/call/call.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
@@ -38,6 +30,14 @@
#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
#include "webrtc/modules/video_coding/codecs/vp8/include/vp8_common_types.h"
#include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/cpu_time.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/format_macros.h"
+#include "webrtc/rtc_base/memory_usage.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/platform_file.h"
+#include "webrtc/rtc_base/timeutils.h"
#include "webrtc/system_wrappers/include/cpu_info.h"
#include "webrtc/system_wrappers/include/field_trial.h"
#include "webrtc/test/gtest.h"
diff --git a/webrtc/video/video_receive_stream.cc b/webrtc/video/video_receive_stream.cc
index acc497b..a8deb54 100644
--- a/webrtc/video/video_receive_stream.cc
+++ b/webrtc/video/video_receive_stream.cc
@@ -16,11 +16,6 @@
#include <string>
#include <utility>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/location.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/trace_event.h"
#include "webrtc/call/rtp_stream_receiver_controller_interface.h"
#include "webrtc/common_types.h"
#include "webrtc/common_video/h264/profile_level_id.h"
@@ -33,6 +28,11 @@
#include "webrtc/modules/video_coding/jitter_estimator.h"
#include "webrtc/modules/video_coding/timing.h"
#include "webrtc/modules/video_coding/utility/ivf_file_writer.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/location.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/trace_event.h"
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/system_wrappers/include/field_trial.h"
#include "webrtc/video/call_stats.h"
diff --git a/webrtc/video/video_receive_stream.h b/webrtc/video/video_receive_stream.h
index a32573d..e6ae947 100644
--- a/webrtc/video/video_receive_stream.h
+++ b/webrtc/video/video_receive_stream.h
@@ -14,7 +14,6 @@
#include <memory>
#include <vector>
-#include "webrtc/base/thread_checker.h"
#include "webrtc/call/rtp_packet_sink_interface.h"
#include "webrtc/call/syncable.h"
#include "webrtc/common_video/include/incoming_video_stream.h"
@@ -22,6 +21,7 @@
#include "webrtc/modules/rtp_rtcp/include/flexfec_receiver.h"
#include "webrtc/modules/video_coding/frame_buffer2.h"
#include "webrtc/modules/video_coding/video_coding_impl.h"
+#include "webrtc/rtc_base/thread_checker.h"
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/video/receive_statistics_proxy.h"
#include "webrtc/video/rtp_streams_synchronizer.h"
diff --git a/webrtc/video/video_receive_stream_unittest.cc b/webrtc/video/video_receive_stream_unittest.cc
index a1b644e..bce4fd3 100644
--- a/webrtc/video/video_receive_stream_unittest.cc
+++ b/webrtc/video/video_receive_stream_unittest.cc
@@ -14,17 +14,17 @@
#include "webrtc/test/gmock.h"
#include "webrtc/api/video_codecs/video_decoder.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/event.h"
#include "webrtc/call/rtp_stream_receiver_controller.h"
#include "webrtc/media/base/fakevideorenderer.h"
#include "webrtc/modules/pacing/packet_router.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_packet_to_send.h"
#include "webrtc/modules/utility/include/process_thread.h"
-#include "webrtc/video/call_stats.h"
-#include "webrtc/video/video_receive_stream.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/event.h"
#include "webrtc/system_wrappers/include/clock.h"
#include "webrtc/test/field_trial.h"
+#include "webrtc/video/call_stats.h"
+#include "webrtc/video/video_receive_stream.h"
namespace webrtc {
namespace {
diff --git a/webrtc/video/video_send_stream.cc b/webrtc/video/video_send_stream.cc
index f4c82f4..9dac54e 100644
--- a/webrtc/video/video_send_stream.cc
+++ b/webrtc/video/video_send_stream.cc
@@ -16,12 +16,6 @@
#include <utility>
#include <vector>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/file.h"
-#include "webrtc/base/location.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/trace_event.h"
-#include "webrtc/base/weak_ptr.h"
#include "webrtc/call/rtp_transport_controller_send_interface.h"
#include "webrtc/common_types.h"
#include "webrtc/common_video/include/video_bitrate_allocator.h"
@@ -33,6 +27,12 @@
#include "webrtc/modules/rtp_rtcp/source/rtp_sender.h"
#include "webrtc/modules/utility/include/process_thread.h"
#include "webrtc/modules/video_coding/utility/ivf_file_writer.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/file.h"
+#include "webrtc/rtc_base/location.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/trace_event.h"
+#include "webrtc/rtc_base/weak_ptr.h"
#include "webrtc/system_wrappers/include/field_trial.h"
#include "webrtc/video/call_stats.h"
#include "webrtc/video/payload_router.h"
diff --git a/webrtc/video/video_send_stream.h b/webrtc/video/video_send_stream.h
index dcdc71c..2f1fec0 100644
--- a/webrtc/video/video_send_stream.h
+++ b/webrtc/video/video_send_stream.h
@@ -16,11 +16,11 @@
#include <vector>
#include "webrtc/call/bitrate_allocator.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/task_queue.h"
#include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
#include "webrtc/modules/video_coding/protection_bitrate_calculator.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/task_queue.h"
#include "webrtc/video/encoder_rtcp_feedback.h"
#include "webrtc/video/send_delay_stats.h"
#include "webrtc/video/send_statistics_proxy.h"
diff --git a/webrtc/video/video_send_stream_tests.cc b/webrtc/video/video_send_stream_tests.cc
index 37a0249..d2844f3 100644
--- a/webrtc/video/video_send_stream_tests.cc
+++ b/webrtc/video/video_send_stream_tests.cc
@@ -11,14 +11,6 @@
#include <memory>
#include <vector>
-#include "webrtc/base/bind.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/platform_thread.h"
-#include "webrtc/base/rate_limiter.h"
-#include "webrtc/base/timeutils.h"
#include "webrtc/call/call.h"
#include "webrtc/common_video/include/frame_callback.h"
#include "webrtc/common_video/include/video_frame.h"
@@ -28,17 +20,25 @@
#include "webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h"
#include "webrtc/modules/video_coding/codecs/vp8/include/vp8.h"
#include "webrtc/modules/video_coding/codecs/vp9/include/vp9.h"
+#include "webrtc/rtc_base/bind.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/platform_thread.h"
+#include "webrtc/rtc_base/rate_limiter.h"
+#include "webrtc/rtc_base/timeutils.h"
#include "webrtc/system_wrappers/include/sleep.h"
#include "webrtc/test/call_test.h"
#include "webrtc/test/configurable_frame_size_encoder.h"
#include "webrtc/test/fake_texture_frame.h"
+#include "webrtc/test/field_trial.h"
#include "webrtc/test/frame_generator.h"
#include "webrtc/test/frame_utils.h"
#include "webrtc/test/gtest.h"
#include "webrtc/test/null_transport.h"
#include "webrtc/test/rtcp_packet_parser.h"
#include "webrtc/test/testsupport/perf_test.h"
-#include "webrtc/test/field_trial.h"
#include "webrtc/video/send_statistics_proxy.h"
#include "webrtc/video/transport_adapter.h"
diff --git a/webrtc/video/video_stream_decoder.cc b/webrtc/video/video_stream_decoder.cc
index a7688ce..742ffd8 100644
--- a/webrtc/video/video_stream_decoder.cc
+++ b/webrtc/video/video_stream_decoder.cc
@@ -14,10 +14,10 @@
#include <map>
#include <vector>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
#include "webrtc/common_video/include/frame_callback.h"
#include "webrtc/modules/video_coding/video_coding_impl.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/system_wrappers/include/metrics.h"
#include "webrtc/video/call_stats.h"
#include "webrtc/video/payload_router.h"
diff --git a/webrtc/video/video_stream_decoder.h b/webrtc/video/video_stream_decoder.h
index b670b12..3e1a4d8 100644
--- a/webrtc/video/video_stream_decoder.h
+++ b/webrtc/video/video_stream_decoder.h
@@ -16,12 +16,12 @@
#include <memory>
#include <vector>
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/platform_thread.h"
-#include "webrtc/base/scoped_ref_ptr.h"
#include "webrtc/media/base/videosinkinterface.h"
#include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
#include "webrtc/modules/video_coding/include/video_coding_defines.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/platform_thread.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/webrtc/video/vie_encoder.cc b/webrtc/video/vie_encoder.cc
index 4522300..c49b76b 100644
--- a/webrtc/video/vie_encoder.cc
+++ b/webrtc/video/vie_encoder.cc
@@ -16,12 +16,6 @@
#include <utility>
#include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/location.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/timeutils.h"
-#include "webrtc/base/trace_event.h"
#include "webrtc/common_video/include/video_bitrate_allocator.h"
#include "webrtc/common_video/include/video_frame.h"
#include "webrtc/modules/pacing/paced_sender.h"
@@ -29,6 +23,12 @@
#include "webrtc/modules/video_coding/include/video_codec_initializer.h"
#include "webrtc/modules/video_coding/include/video_coding.h"
#include "webrtc/modules/video_coding/include/video_coding_defines.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/location.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/rtc_base/trace_event.h"
#include "webrtc/video/overuse_frame_detector.h"
#include "webrtc/video/send_statistics_proxy.h"
diff --git a/webrtc/video/vie_encoder.h b/webrtc/video/vie_encoder.h
index 91c6ca4..6e9234f 100644
--- a/webrtc/video/vie_encoder.h
+++ b/webrtc/video/vie_encoder.h
@@ -18,10 +18,6 @@
#include "webrtc/api/video/video_rotation.h"
#include "webrtc/api/video_codecs/video_encoder.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/sequenced_task_checker.h"
-#include "webrtc/base/task_queue.h"
#include "webrtc/call/call.h"
#include "webrtc/common_types.h"
#include "webrtc/common_video/include/video_bitrate_allocator.h"
@@ -29,6 +25,10 @@
#include "webrtc/modules/video_coding/include/video_coding_defines.h"
#include "webrtc/modules/video_coding/utility/quality_scaler.h"
#include "webrtc/modules/video_coding/video_coding_impl.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/sequenced_task_checker.h"
+#include "webrtc/rtc_base/task_queue.h"
#include "webrtc/system_wrappers/include/atomic32.h"
#include "webrtc/typedefs.h"
#include "webrtc/video/overuse_frame_detector.h"
diff --git a/webrtc/video/vie_encoder_unittest.cc b/webrtc/video/vie_encoder_unittest.cc
index 3a9e95e..09ac4c9 100644
--- a/webrtc/video/vie_encoder_unittest.cc
+++ b/webrtc/video/vie_encoder_unittest.cc
@@ -13,11 +13,11 @@
#include <utility>
#include "webrtc/api/video/i420_buffer.h"
-#include "webrtc/base/fakeclock.h"
-#include "webrtc/base/logging.h"
#include "webrtc/media/base/videoadapter.h"
#include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h"
#include "webrtc/modules/video_coding/utility/default_video_bitrate_allocator.h"
+#include "webrtc/rtc_base/fakeclock.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/system_wrappers/include/metrics_default.h"
#include "webrtc/system_wrappers/include/sleep.h"
#include "webrtc/test/encoder_settings.h"
diff --git a/webrtc/video_receive_stream.h b/webrtc/video_receive_stream.h
index b3a98c6..a53d869 100644
--- a/webrtc/video_receive_stream.h
+++ b/webrtc/video_receive_stream.h
@@ -17,11 +17,11 @@
#include <vector>
#include "webrtc/api/call/transport.h"
-#include "webrtc/base/platform_file.h"
#include "webrtc/common_types.h"
#include "webrtc/common_video/include/frame_callback.h"
#include "webrtc/config.h"
#include "webrtc/media/base/videosinkinterface.h"
+#include "webrtc/rtc_base/platform_file.h"
namespace webrtc {
diff --git a/webrtc/video_send_stream.h b/webrtc/video_send_stream.h
index 266112e..c5a1f9b 100644
--- a/webrtc/video_send_stream.h
+++ b/webrtc/video_send_stream.h
@@ -18,12 +18,12 @@
#include <utility>
#include "webrtc/api/call/transport.h"
-#include "webrtc/base/platform_file.h"
#include "webrtc/common_types.h"
#include "webrtc/common_video/include/frame_callback.h"
#include "webrtc/config.h"
#include "webrtc/media/base/videosinkinterface.h"
#include "webrtc/media/base/videosourceinterface.h"
+#include "webrtc/rtc_base/platform_file.h"
namespace webrtc {
diff --git a/webrtc/voice_engine/audio_level.h b/webrtc/voice_engine/audio_level.h
index 5040950..3bcb0d9 100644
--- a/webrtc/voice_engine/audio_level.h
+++ b/webrtc/voice_engine/audio_level.h
@@ -11,7 +11,7 @@
#ifndef WEBRTC_VOICE_ENGINE_AUDIO_LEVEL_H_
#define WEBRTC_VOICE_ENGINE_AUDIO_LEVEL_H_
-#include "webrtc/base/criticalsection.h"
+#include "webrtc/rtc_base/criticalsection.h"
#include "webrtc/typedefs.h"
namespace webrtc {
diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
index 1612270..45b6db0 100644
--- a/webrtc/voice_engine/channel.cc
+++ b/webrtc/voice_engine/channel.cc
@@ -14,16 +14,6 @@
#include <utility>
#include "webrtc/audio/utility/audio_frame_operations.h"
-#include "webrtc/base/array_view.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/format_macros.h"
-#include "webrtc/base/location.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/rate_limiter.h"
-#include "webrtc/base/task_queue.h"
-#include "webrtc/base/thread_checker.h"
-#include "webrtc/base/timeutils.h"
#include "webrtc/call/rtp_transport_controller_send_interface.h"
#include "webrtc/config.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log.h"
@@ -38,6 +28,16 @@
#include "webrtc/modules/rtp_rtcp/source/rtp_packet_received.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h"
#include "webrtc/modules/utility/include/process_thread.h"
+#include "webrtc/rtc_base/array_view.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/format_macros.h"
+#include "webrtc/rtc_base/location.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/rate_limiter.h"
+#include "webrtc/rtc_base/task_queue.h"
+#include "webrtc/rtc_base/thread_checker.h"
+#include "webrtc/rtc_base/timeutils.h"
#include "webrtc/system_wrappers/include/field_trial.h"
#include "webrtc/system_wrappers/include/trace.h"
#include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
diff --git a/webrtc/voice_engine/channel.h b/webrtc/voice_engine/channel.h
index 101de40..492083e 100644
--- a/webrtc/voice_engine/channel.h
+++ b/webrtc/voice_engine/channel.h
@@ -16,10 +16,6 @@
#include "webrtc/api/audio/audio_mixer.h"
#include "webrtc/api/audio_codecs/audio_encoder.h"
#include "webrtc/api/call/audio_sink.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/event.h"
-#include "webrtc/base/optional.h"
-#include "webrtc/base/thread_checker.h"
#include "webrtc/common_audio/resampler/include/push_resampler.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/audio_coding/acm2/codec_manager.h"
@@ -31,6 +27,10 @@
#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_receiver.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/event.h"
+#include "webrtc/rtc_base/optional.h"
+#include "webrtc/rtc_base/thread_checker.h"
#include "webrtc/voice_engine/audio_level.h"
#include "webrtc/voice_engine/file_player.h"
#include "webrtc/voice_engine/file_recorder.h"
diff --git a/webrtc/voice_engine/channel_manager.cc b/webrtc/voice_engine/channel_manager.cc
index 58aef6f..ff7a802 100644
--- a/webrtc/voice_engine/channel_manager.cc
+++ b/webrtc/voice_engine/channel_manager.cc
@@ -10,7 +10,7 @@
#include "webrtc/voice_engine/channel_manager.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/timeutils.h"
#include "webrtc/voice_engine/channel.h"
namespace webrtc {
diff --git a/webrtc/voice_engine/channel_manager.h b/webrtc/voice_engine/channel_manager.h
index 65cf994..11a44cf 100644
--- a/webrtc/voice_engine/channel_manager.h
+++ b/webrtc/voice_engine/channel_manager.h
@@ -14,10 +14,10 @@
#include <memory>
#include <vector>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/random.h"
-#include "webrtc/base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/random.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
#include "webrtc/system_wrappers/include/atomic32.h"
#include "webrtc/typedefs.h"
#include "webrtc/voice_engine/include/voe_base.h"
diff --git a/webrtc/voice_engine/channel_proxy.cc b/webrtc/voice_engine/channel_proxy.cc
index 4a0b3cc..4c6dd38 100644
--- a/webrtc/voice_engine/channel_proxy.cc
+++ b/webrtc/voice_engine/channel_proxy.cc
@@ -13,10 +13,10 @@
#include <utility>
#include "webrtc/api/call/audio_sink.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/safe_minmax.h"
#include "webrtc/call/rtp_transport_controller_send_interface.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/safe_minmax.h"
#include "webrtc/voice_engine/channel.h"
namespace webrtc {
diff --git a/webrtc/voice_engine/channel_proxy.h b/webrtc/voice_engine/channel_proxy.h
index f5417f2..eb4bd70 100644
--- a/webrtc/voice_engine/channel_proxy.h
+++ b/webrtc/voice_engine/channel_proxy.h
@@ -14,10 +14,10 @@
#include "webrtc/api/audio/audio_mixer.h"
#include "webrtc/api/audio_codecs/audio_encoder.h"
#include "webrtc/api/rtpreceiverinterface.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/race_checker.h"
-#include "webrtc/base/thread_checker.h"
#include "webrtc/call/rtp_packet_sink_interface.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/race_checker.h"
+#include "webrtc/rtc_base/thread_checker.h"
#include "webrtc/voice_engine/channel_manager.h"
#include "webrtc/voice_engine/include/voe_rtp_rtcp.h"
diff --git a/webrtc/voice_engine/file_player.cc b/webrtc/voice_engine/file_player.cc
index d2eadae..6d9aaae 100644
--- a/webrtc/voice_engine/file_player.cc
+++ b/webrtc/voice_engine/file_player.cc
@@ -10,11 +10,11 @@
#include "webrtc/voice_engine/file_player.h"
-#include "webrtc/base/logging.h"
#include "webrtc/common_audio/resampler/include/resampler.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/media_file/media_file.h"
#include "webrtc/modules/media_file/media_file_defines.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/typedefs.h"
#include "webrtc/voice_engine/coder.h"
diff --git a/webrtc/voice_engine/file_player_unittests.cc b/webrtc/voice_engine/file_player_unittests.cc
index d41f404..38ee987 100644
--- a/webrtc/voice_engine/file_player_unittests.cc
+++ b/webrtc/voice_engine/file_player_unittests.cc
@@ -18,8 +18,8 @@
#include <string>
#include "gflags/gflags.h"
-#include "webrtc/base/md5digest.h"
-#include "webrtc/base/stringencode.h"
+#include "webrtc/rtc_base/md5digest.h"
+#include "webrtc/rtc_base/stringencode.h"
#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
diff --git a/webrtc/voice_engine/file_recorder.cc b/webrtc/voice_engine/file_recorder.cc
index eed3c07..1d35be9 100644
--- a/webrtc/voice_engine/file_recorder.cc
+++ b/webrtc/voice_engine/file_recorder.cc
@@ -13,13 +13,13 @@
#include <list>
#include "webrtc/audio/utility/audio_frame_operations.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/platform_thread.h"
#include "webrtc/common_audio/resampler/include/resampler.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/include/module_common_types.h"
#include "webrtc/modules/media_file/media_file.h"
#include "webrtc/modules/media_file/media_file_defines.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/platform_thread.h"
#include "webrtc/system_wrappers/include/event_wrapper.h"
#include "webrtc/typedefs.h"
#include "webrtc/voice_engine/coder.h"
diff --git a/webrtc/voice_engine/include/voe_base.h b/webrtc/voice_engine/include/voe_base.h
index 05fe455..b32d8df 100644
--- a/webrtc/voice_engine/include/voe_base.h
+++ b/webrtc/voice_engine/include/voe_base.h
@@ -35,9 +35,9 @@
#define WEBRTC_VOICE_ENGINE_VOE_BASE_H
#include "webrtc/api/audio_codecs/audio_decoder_factory.h"
-#include "webrtc/base/scoped_ref_ptr.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/audio_coding/include/audio_coding_module.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
namespace webrtc {
diff --git a/webrtc/voice_engine/output_mixer.cc b/webrtc/voice_engine/output_mixer.cc
index 170689a..c497cc1 100644
--- a/webrtc/voice_engine/output_mixer.cc
+++ b/webrtc/voice_engine/output_mixer.cc
@@ -10,8 +10,8 @@
#include "webrtc/voice_engine/output_mixer.h"
-#include "webrtc/base/format_macros.h"
#include "webrtc/modules/audio_processing/include/audio_processing.h"
+#include "webrtc/rtc_base/format_macros.h"
#include "webrtc/system_wrappers/include/file_wrapper.h"
#include "webrtc/system_wrappers/include/trace.h"
#include "webrtc/voice_engine/statistics.h"
diff --git a/webrtc/voice_engine/output_mixer.h b/webrtc/voice_engine/output_mixer.h
index 79c5e09..fe0cb30 100644
--- a/webrtc/voice_engine/output_mixer.h
+++ b/webrtc/voice_engine/output_mixer.h
@@ -13,11 +13,11 @@
#include <memory>
-#include "webrtc/base/criticalsection.h"
#include "webrtc/common_audio/resampler/include/push_resampler.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer.h"
#include "webrtc/modules/audio_conference_mixer/include/audio_conference_mixer_defines.h"
+#include "webrtc/rtc_base/criticalsection.h"
#include "webrtc/voice_engine/file_recorder.h"
namespace webrtc {
diff --git a/webrtc/voice_engine/shared_data.h b/webrtc/voice_engine/shared_data.h
index 951a851..971d7d7 100644
--- a/webrtc/voice_engine/shared_data.h
+++ b/webrtc/voice_engine/shared_data.h
@@ -13,14 +13,14 @@
#include <memory>
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/task_queue.h"
-#include "webrtc/base/thread_annotations.h"
-#include "webrtc/base/thread_checker.h"
#include "webrtc/modules/audio_device/include/audio_device.h"
#include "webrtc/modules/audio_processing/include/audio_processing.h"
#include "webrtc/modules/utility/include/process_thread.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/rtc_base/task_queue.h"
+#include "webrtc/rtc_base/thread_annotations.h"
+#include "webrtc/rtc_base/thread_checker.h"
#include "webrtc/voice_engine/channel_manager.h"
#include "webrtc/voice_engine/statistics.h"
#include "webrtc/voice_engine/voice_engine_defines.h"
diff --git a/webrtc/voice_engine/statistics.h b/webrtc/voice_engine/statistics.h
index 785fe14..e0aa248 100644
--- a/webrtc/voice_engine/statistics.h
+++ b/webrtc/voice_engine/statistics.h
@@ -11,8 +11,8 @@
#ifndef WEBRTC_VOICE_ENGINE_STATISTICS_H
#define WEBRTC_VOICE_ENGINE_STATISTICS_H
-#include "webrtc/base/criticalsection.h"
#include "webrtc/common_types.h"
+#include "webrtc/rtc_base/criticalsection.h"
#include "webrtc/typedefs.h"
#include "webrtc/voice_engine/include/voe_errors.h"
#include "webrtc/voice_engine/voice_engine_defines.h"
diff --git a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc
index f7510c7..305b236 100644
--- a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc
+++ b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.cc
@@ -12,8 +12,8 @@
#include <string>
-#include "webrtc/base/byteorder.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/byteorder.h"
+#include "webrtc/rtc_base/timeutils.h"
#include "webrtc/system_wrappers/include/sleep.h"
#include "webrtc/voice_engine/channel_proxy.h"
#include "webrtc/voice_engine/voice_engine_impl.h"
diff --git a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h
index 19fb15f..22711bd 100644
--- a/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h
+++ b/webrtc/voice_engine/test/auto_test/fakes/conference_transport.h
@@ -16,11 +16,11 @@
#include <memory>
#include <utility>
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/platform_thread.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/platform_thread.h"
#include "webrtc/system_wrappers/include/event_wrapper.h"
#include "webrtc/test/gtest.h"
#include "webrtc/voice_engine/include/voe_base.h"
diff --git a/webrtc/voice_engine/test/auto_test/fakes/loudest_filter.cc b/webrtc/voice_engine/test/auto_test/fakes/loudest_filter.cc
index 4ee7386..ec1d667 100644
--- a/webrtc/voice_engine/test/auto_test/fakes/loudest_filter.cc
+++ b/webrtc/voice_engine/test/auto_test/fakes/loudest_filter.cc
@@ -10,7 +10,7 @@
#include "webrtc/voice_engine/test/auto_test/fakes/loudest_filter.h"
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
namespace voetest {
diff --git a/webrtc/voice_engine/test/auto_test/fakes/loudest_filter.h b/webrtc/voice_engine/test/auto_test/fakes/loudest_filter.h
index 525e8ee..dd5a426 100644
--- a/webrtc/voice_engine/test/auto_test/fakes/loudest_filter.h
+++ b/webrtc/voice_engine/test/auto_test/fakes/loudest_filter.h
@@ -12,8 +12,8 @@
#define WEBRTC_VOICE_ENGINE_TEST_AUTO_TEST_FAKES_LOUDEST_FILTER_H_
#include <map>
-#include "webrtc/base/timeutils.h"
#include "webrtc/common_types.h"
+#include "webrtc/rtc_base/timeutils.h"
namespace webrtc {
namespace voetest {
diff --git a/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h b/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h
index 6608669..1404fa5 100644
--- a/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h
+++ b/webrtc/voice_engine/test/auto_test/fixtures/after_initialization_fixture.h
@@ -14,10 +14,10 @@
#include <deque>
#include <memory>
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/platform_thread.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/rtp_rtcp/source/byte_io.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/platform_thread.h"
#include "webrtc/system_wrappers/include/atomic32.h"
#include "webrtc/system_wrappers/include/event_wrapper.h"
#include "webrtc/system_wrappers/include/sleep.h"
diff --git a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc b/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc
index 0cb9990..9af0eec 100644
--- a/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc
+++ b/webrtc/voice_engine/test/auto_test/standard/rtp_rtcp_test.cc
@@ -10,7 +10,7 @@
#include <memory>
-#include "webrtc/base/criticalsection.h"
+#include "webrtc/rtc_base/criticalsection.h"
#include "webrtc/system_wrappers/include/atomic32.h"
#include "webrtc/system_wrappers/include/event_wrapper.h"
#include "webrtc/test/testsupport/fileutils.h"
diff --git a/webrtc/voice_engine/test/auto_test/voe_conference_test.cc b/webrtc/voice_engine/test/auto_test/voe_conference_test.cc
index ffffb48..9e466af 100644
--- a/webrtc/voice_engine/test/auto_test/voe_conference_test.cc
+++ b/webrtc/voice_engine/test/auto_test/voe_conference_test.cc
@@ -10,8 +10,8 @@
#include <queue>
-#include "webrtc/base/format_macros.h"
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/format_macros.h"
+#include "webrtc/rtc_base/timeutils.h"
#include "webrtc/system_wrappers/include/sleep.h"
#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
diff --git a/webrtc/voice_engine/transmit_mixer.cc b/webrtc/voice_engine/transmit_mixer.cc
index 6796f84..ab0b6c7 100644
--- a/webrtc/voice_engine/transmit_mixer.cc
+++ b/webrtc/voice_engine/transmit_mixer.cc
@@ -13,9 +13,9 @@
#include <memory>
#include "webrtc/audio/utility/audio_frame_operations.h"
-#include "webrtc/base/format_macros.h"
-#include "webrtc/base/location.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/format_macros.h"
+#include "webrtc/rtc_base/location.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/system_wrappers/include/event_wrapper.h"
#include "webrtc/system_wrappers/include/trace.h"
#include "webrtc/voice_engine/channel.h"
diff --git a/webrtc/voice_engine/transmit_mixer.h b/webrtc/voice_engine/transmit_mixer.h
index a045cf8..47f67f9 100644
--- a/webrtc/voice_engine/transmit_mixer.h
+++ b/webrtc/voice_engine/transmit_mixer.h
@@ -13,11 +13,11 @@
#include <memory>
-#include "webrtc/base/criticalsection.h"
#include "webrtc/common_audio/resampler/include/push_resampler.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/audio_processing/typing_detection.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/criticalsection.h"
#include "webrtc/voice_engine/audio_level.h"
#include "webrtc/voice_engine/file_player.h"
#include "webrtc/voice_engine/file_recorder.h"
diff --git a/webrtc/voice_engine/transport_feedback_packet_loss_tracker.cc b/webrtc/voice_engine/transport_feedback_packet_loss_tracker.cc
index 07af861..86ca61e 100644
--- a/webrtc/voice_engine/transport_feedback_packet_loss_tracker.cc
+++ b/webrtc/voice_engine/transport_feedback_packet_loss_tracker.cc
@@ -13,10 +13,10 @@
#include <limits>
#include <utility>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/mod_ops.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/mod_ops.h"
namespace {
constexpr uint16_t kSeqNumHalf = 0x8000u;
diff --git a/webrtc/voice_engine/transport_feedback_packet_loss_tracker.h b/webrtc/voice_engine/transport_feedback_packet_loss_tracker.h
index ea82f74..987ba25 100644
--- a/webrtc/voice_engine/transport_feedback_packet_loss_tracker.h
+++ b/webrtc/voice_engine/transport_feedback_packet_loss_tracker.h
@@ -13,8 +13,8 @@
#include <map>
-#include "webrtc/base/optional.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/optional.h"
namespace webrtc {
diff --git a/webrtc/voice_engine/transport_feedback_packet_loss_tracker_unittest.cc b/webrtc/voice_engine/transport_feedback_packet_loss_tracker_unittest.cc
index f019203..b3fa25b 100644
--- a/webrtc/voice_engine/transport_feedback_packet_loss_tracker_unittest.cc
+++ b/webrtc/voice_engine/transport_feedback_packet_loss_tracker_unittest.cc
@@ -13,9 +13,9 @@
#include <numeric>
#include <vector>
-#include "webrtc/base/checks.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
+#include "webrtc/rtc_base/checks.h"
#include "webrtc/test/gmock.h"
#include "webrtc/test/gtest.h"
#include "webrtc/voice_engine/transport_feedback_packet_loss_tracker.h"
diff --git a/webrtc/voice_engine/utility.cc b/webrtc/voice_engine/utility.cc
index f877c43..4b4397a 100644
--- a/webrtc/voice_engine/utility.cc
+++ b/webrtc/voice_engine/utility.cc
@@ -11,12 +11,12 @@
#include "webrtc/voice_engine/utility.h"
#include "webrtc/audio/utility/audio_frame_operations.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
#include "webrtc/common_audio/resampler/include/push_resampler.h"
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
#include "webrtc/common_types.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/voice_engine/voice_engine_defines.h"
namespace webrtc {
diff --git a/webrtc/voice_engine/utility_unittest.cc b/webrtc/voice_engine/utility_unittest.cc
index 992cb71..fc4f399 100644
--- a/webrtc/voice_engine/utility_unittest.cc
+++ b/webrtc/voice_engine/utility_unittest.cc
@@ -10,13 +10,13 @@
#include <math.h>
-#include "webrtc/base/format_macros.h"
#include "webrtc/common_audio/resampler/include/push_resampler.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/format_macros.h"
#include "webrtc/test/gtest.h"
#include "webrtc/voice_engine/utility.h"
#include "webrtc/voice_engine/voice_engine_defines.h"
-#include "webrtc/base/arraysize.h"
namespace webrtc {
namespace voe {
diff --git a/webrtc/voice_engine/voe_base_impl.cc b/webrtc/voice_engine/voe_base_impl.cc
index 196c6a5..9b82ec9 100644
--- a/webrtc/voice_engine/voe_base_impl.cc
+++ b/webrtc/voice_engine/voe_base_impl.cc
@@ -11,13 +11,13 @@
#include "webrtc/voice_engine/voe_base_impl.h"
#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
-#include "webrtc/base/format_macros.h"
-#include "webrtc/base/location.h"
-#include "webrtc/base/logging.h"
#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
#include "webrtc/modules/audio_coding/include/audio_coding_module.h"
#include "webrtc/modules/audio_device/audio_device_impl.h"
#include "webrtc/modules/audio_processing/include/audio_processing.h"
+#include "webrtc/rtc_base/format_macros.h"
+#include "webrtc/rtc_base/location.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/system_wrappers/include/file_wrapper.h"
#include "webrtc/voice_engine/channel.h"
#include "webrtc/voice_engine/include/voe_errors.h"
diff --git a/webrtc/voice_engine/voe_base_impl.h b/webrtc/voice_engine/voe_base_impl.h
index 6d7a086..0324abd 100644
--- a/webrtc/voice_engine/voe_base_impl.h
+++ b/webrtc/voice_engine/voe_base_impl.h
@@ -13,8 +13,8 @@
#include "webrtc/voice_engine/include/voe_base.h"
-#include "webrtc/base/criticalsection.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/criticalsection.h"
#include "webrtc/voice_engine/shared_data.h"
namespace webrtc {
diff --git a/webrtc/voice_engine/voe_codec_impl.cc b/webrtc/voice_engine/voe_codec_impl.cc
index 2022024..cdd2403 100644
--- a/webrtc/voice_engine/voe_codec_impl.cc
+++ b/webrtc/voice_engine/voe_codec_impl.cc
@@ -10,8 +10,8 @@
#include "webrtc/voice_engine/voe_codec_impl.h"
-#include "webrtc/base/format_macros.h"
#include "webrtc/modules/audio_coding/include/audio_coding_module.h"
+#include "webrtc/rtc_base/format_macros.h"
#include "webrtc/system_wrappers/include/trace.h"
#include "webrtc/voice_engine/channel.h"
#include "webrtc/voice_engine/include/voe_errors.h"
diff --git a/webrtc/voice_engine/voe_network_impl.cc b/webrtc/voice_engine/voe_network_impl.cc
index 4dc1a5f..26ad417 100644
--- a/webrtc/voice_engine/voe_network_impl.cc
+++ b/webrtc/voice_engine/voe_network_impl.cc
@@ -10,9 +10,9 @@
#include "webrtc/voice_engine/voe_network_impl.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/format_macros.h"
-#include "webrtc/base/logging.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/format_macros.h"
+#include "webrtc/rtc_base/logging.h"
#include "webrtc/voice_engine/channel.h"
#include "webrtc/voice_engine/include/voe_errors.h"
#include "webrtc/voice_engine/voice_engine_impl.h"
diff --git a/webrtc/voice_engine/voice_engine_impl.cc b/webrtc/voice_engine/voice_engine_impl.cc
index ab2dc65..d2d0fdd 100644
--- a/webrtc/voice_engine/voice_engine_impl.cc
+++ b/webrtc/voice_engine/voice_engine_impl.cc
@@ -14,8 +14,8 @@
#include "webrtc/modules/audio_device/android/audio_track_jni.h"
#endif
-#include "webrtc/base/checks.h"
#include "webrtc/modules/audio_coding/include/audio_coding_module.h"
+#include "webrtc/rtc_base/checks.h"
#include "webrtc/system_wrappers/include/trace.h"
#include "webrtc/voice_engine/channel_proxy.h"
#include "webrtc/voice_engine/voice_engine_impl.h"
