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}

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"

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;

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"

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 {

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"

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 {

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 {

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 {
 

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 {
 

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 {

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 {

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 {

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 {

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 {
 

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"
 

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 {
 

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"

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"

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"
 

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"

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"

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 {

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 {
 

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"

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"

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 {

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 {
 

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 {
 

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 {
 

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"
 

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 {
 

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 {
 

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"
 

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 {
 

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 {

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 {
 

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 {
 

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;

webrtc/call/syncable.h

@@ -16,7 +16,7 @@
 
 #include <stdint.h>
 
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 

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;
 

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 {
 

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 {

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.
 

webrtc/common_audio/blocker.cc

@@ -12,7 +12,7 @@
 
 #include <string.h>
 
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace {
 

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 {

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 {
 

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 {
 

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 {

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 {

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 {

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 {

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 {
 

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 {
 

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 {
 

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 {
 

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 {

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.

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 {
 

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 {

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"

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"
 

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"
 

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"

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 {
 

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,

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];
 

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 {
 

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 {

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 {

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 {
 

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 {
 

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 {

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 {

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 {
 

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"
 

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 {
 

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 {
 

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 {

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;
 

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 {
 

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 {
 

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)

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 {

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;

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;

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 {
 

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)) {                                    \

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;

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 {

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;
 

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;

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 {

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"

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;

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 {

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 {
 

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"

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 {
 

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 {
 

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 {