Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)"

This reverts commit c8fa692ec44fd6ba4fa3d085ac3161a262fc18c5.

BUG=webrtc:7634
NOTRY=True
NOPRESUBMIT=True

Review-Url: https://codereview.webrtc.org/2964773002 .
Cr-Commit-Position: refs/heads/master@{#18872}

webrtc/modules/audio_coding/acm2/acm_codec_database.cc

@@ -19,7 +19,7 @@
 
 #include <assert.h>
 
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
 
 #if ((defined WEBRTC_CODEC_ISAC) && (defined WEBRTC_CODEC_ISACFX))
 #error iSAC and iSACFX codecs cannot be enabled at the same time

webrtc/modules/audio_coding/acm2/acm_receive_test.h

@@ -15,8 +15,8 @@
 #include <string>
 
 #include "webrtc/api/audio_codecs/audio_decoder_factory.h"
-#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/base/constructormagic.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/acm2/acm_receiver.cc

@@ -16,17 +16,17 @@
 #include <vector>
 
 #include "webrtc/api/audio_codecs/audio_decoder.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/format_macros.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/safe_conversions.h"
 #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/acm2/acm_resampler.h"
 #include "webrtc/modules/audio_coding/acm2/call_statistics.h"
-#include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
 #include "webrtc/modules/audio_coding/neteq/include/neteq.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/format_macros.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/safe_conversions.h"
 #include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/acm2/acm_receiver.h

@@ -16,16 +16,16 @@
 #include <string>
 #include <vector>
 
+#include "webrtc/base/array_view.h"
+#include "webrtc/base/criticalsection.h"
+#include "webrtc/base/optional.h"
+#include "webrtc/base/thread_annotations.h"
 #include "webrtc/common_audio/vad/include/webrtc_vad.h"
 #include "webrtc/modules/audio_coding/acm2/acm_resampler.h"
 #include "webrtc/modules/audio_coding/acm2/call_statistics.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
 #include "webrtc/modules/audio_coding/neteq/include/neteq.h"
 #include "webrtc/modules/include/module_common_types.h"
-#include "webrtc/rtc_base/array_view.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/optional.h"
-#include "webrtc/rtc_base/thread_annotations.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/acm2/acm_receiver_unittest.cc

@@ -14,11 +14,11 @@
 #include <memory>
 
 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/safe_conversions.h"
 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
 #include "webrtc/modules/audio_coding/neteq/tools/rtp_generator.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/safe_conversions.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/testsupport/fileutils.h"

webrtc/modules/audio_coding/acm2/acm_resampler.cc

@@ -14,7 +14,7 @@
 #include <string.h>
 
 #include "webrtc/common_audio/resampler/include/resampler.h"
-#include "webrtc/rtc_base/logging.h"
+#include "webrtc/base/logging.h"
 
 namespace webrtc {
 namespace acm2 {

webrtc/modules/audio_coding/acm2/acm_send_test.cc

@@ -15,10 +15,10 @@
 #include <string.h>
 
 #include "webrtc/api/audio_codecs/audio_encoder.h"
+#include "webrtc/base/checks.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
 #include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h"
 #include "webrtc/modules/audio_coding/neteq/tools/packet.h"
-#include "webrtc/rtc_base/checks.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/acm2/acm_send_test.h

@@ -14,9 +14,9 @@
 #include <memory>
 #include <vector>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
 #include "webrtc/modules/audio_coding/neteq/tools/packet_source.h"
-#include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/acm2/audio_coding_module.cc

@@ -11,13 +11,13 @@
 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
 
 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/safe_conversions.h"
 #include "webrtc/modules/audio_coding/acm2/acm_receiver.h"
 #include "webrtc/modules/audio_coding/acm2/acm_resampler.h"
 #include "webrtc/modules/audio_coding/acm2/codec_manager.h"
 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/safe_conversions.h"
 #include "webrtc/system_wrappers/include/metrics.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/acm2/audio_coding_module_unittest.cc

@@ -15,6 +15,10 @@
 
 #include "webrtc/api/audio_codecs/audio_encoder.h"
 #include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
+#include "webrtc/base/criticalsection.h"
+#include "webrtc/base/md5digest.h"
+#include "webrtc/base/platform_thread.h"
+#include "webrtc/base/thread_annotations.h"
 #include "webrtc/modules/audio_coding/acm2/acm_receive_test.h"
 #include "webrtc/modules/audio_coding/acm2/acm_send_test.h"
 #include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h"
@@ -34,10 +38,6 @@
 #include "webrtc/modules/audio_coding/neteq/tools/packet.h"
 #include "webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h"
 #include "webrtc/modules/include/module_common_types.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/md5digest.h"
-#include "webrtc/rtc_base/platform_thread.h"
-#include "webrtc/rtc_base/thread_annotations.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/system_wrappers/include/event_wrapper.h"
 #include "webrtc/system_wrappers/include/sleep.h"

webrtc/modules/audio_coding/acm2/call_statistics.cc

@@ -10,7 +10,7 @@
 
 #include "webrtc/modules/audio_coding/acm2/call_statistics.h"
 
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/acm2/codec_manager.cc

@@ -10,10 +10,10 @@
 
 #include "webrtc/modules/audio_coding/acm2/codec_manager.h"
 
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
-//#include "webrtc/rtc_base/format_macros.h"
+//#include "webrtc/base/format_macros.h"
+#include "webrtc/base/logging.h"
 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
-#include "webrtc/rtc_base/logging.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/acm2/codec_manager.h

@@ -13,13 +13,13 @@
 
 #include <map>
 
-#include "webrtc/common_types.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/optional.h"
+#include "webrtc/base/thread_checker.h"
 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h"
-#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/common_types.h"
-#include "webrtc/rtc_base/optional.h"
-#include "webrtc/rtc_base/thread_checker.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/acm2/rent_a_codec.cc

@@ -13,9 +13,9 @@
 #include <memory>
 #include <utility>
 
+#include "webrtc/base/logging.h"
 #include "webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h"
 #include "webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h"
-#include "webrtc/rtc_base/logging.h"
 #ifdef WEBRTC_CODEC_G722
 #include "webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.h"
 #endif

webrtc/modules/audio_coding/acm2/rent_a_codec.h

@@ -17,12 +17,12 @@
 
 #include "webrtc/api/audio_codecs/audio_decoder.h"
 #include "webrtc/api/audio_codecs/audio_encoder.h"
+#include "webrtc/base/array_view.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/optional.h"
+#include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h"
 #include "webrtc/modules/audio_coding/neteq/neteq_decoder_enum.h"
-#include "webrtc/rtc_base/array_view.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/optional.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/acm2/rent_a_codec_unittest.cc

@@ -10,8 +10,8 @@
 
 #include <memory>
 
+#include "webrtc/base/arraysize.h"
 #include "webrtc/modules/audio_coding/acm2/rent_a_codec.h"
-#include "webrtc/rtc_base/arraysize.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/mock_audio_encoder.h"
 

webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.cc

@@ -12,8 +12,8 @@
 
 #include <utility>
 
-#include "webrtc/rtc_base/logging.h"
+#include "webrtc/base/logging.h"
-#include "webrtc/rtc_base/timeutils.h"
+#include "webrtc/base/timeutils.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h

@@ -13,12 +13,12 @@
 
 #include <memory>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/event_log_writer.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
-#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl_unittest.cc

@@ -11,12 +11,12 @@
 #include <utility>
 #include <vector>
 
+#include "webrtc/base/fakeclock.h"
 #include "webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller_manager.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h"
-#include "webrtc/rtc_base/fakeclock.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.cc

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

webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.h

@@ -11,8 +11,8 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_BITRATE_CONTROLLER_H_
 #define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_BITRATE_CONTROLLER_H_
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h"
-#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 namespace audio_network_adaptor {

webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.cc

@@ -11,7 +11,7 @@
 #include <algorithm>
 
 #include "webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.h"
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.h

@@ -11,8 +11,8 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CHANNEL_CONTROLLER_H_
 #define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CHANNEL_CONTROLLER_H_
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h"
-#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/audio_network_adaptor/controller.h

@@ -11,8 +11,8 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CONTROLLER_H_
 #define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_CONTROLLER_H_
 
+#include "webrtc/base/optional.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
-#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.cc

@@ -13,6 +13,8 @@
 #include <cmath>
 #include <utility>
 
+#include "webrtc/base/ignore_wundef.h"
+#include "webrtc/base/timeutils.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h"
@@ -21,8 +23,6 @@
 #include "webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/util/threshold_curve.h"
-#include "webrtc/rtc_base/ignore_wundef.h"
-#include "webrtc/rtc_base/timeutils.h"
 
 #if WEBRTC_ENABLE_PROTOBUF
 RTC_PUSH_IGNORING_WUNDEF()

webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h

@@ -15,9 +15,9 @@
 #include <memory>
 #include <vector>
 
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/protobuf_utils.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/protobuf_utils.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc

@@ -10,12 +10,12 @@
 
 #include <utility>
 
+#include "webrtc/base/fakeclock.h"
+#include "webrtc/base/ignore_wundef.h"
+#include "webrtc/base/protobuf_utils.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_debug_dump_writer.h"
-#include "webrtc/rtc_base/fakeclock.h"
-#include "webrtc/rtc_base/ignore_wundef.h"
-#include "webrtc/rtc_base/protobuf_utils.h"
 #include "webrtc/test/gtest.h"
 
 #if WEBRTC_ENABLE_PROTOBUF

webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.cc

@@ -10,9 +10,9 @@
 
 #include "webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h"
 
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
-#include "webrtc/rtc_base/ignore_wundef.h"
+#include "webrtc/base/ignore_wundef.h"
-#include "webrtc/rtc_base/protobuf_utils.h"
+#include "webrtc/base/protobuf_utils.h"
 
 #if WEBRTC_ENABLE_PROTOBUF
 RTC_PUSH_IGNORING_WUNDEF()

webrtc/modules/audio_coding/audio_network_adaptor/debug_dump_writer.h

@@ -13,10 +13,10 @@
 
 #include <memory>
 
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/ignore_wundef.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/ignore_wundef.h"
 #include "webrtc/system_wrappers/include/file_wrapper.h"
 #if WEBRTC_ENABLE_PROTOBUF
 RTC_PUSH_IGNORING_WUNDEF()

webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.cc

@@ -9,7 +9,7 @@
  */
 
 #include "webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.h"
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.h

@@ -11,8 +11,8 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_DTX_CONTROLLER_H_
 #define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_DTX_CONTROLLER_H_
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h"
-#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/audio_network_adaptor/event_log_writer.h

@@ -11,8 +11,8 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_EVENT_LOG_WRITER_H_
 #define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_EVENT_LOG_WRITER_H_
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
-#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 class RtcEventLog;

webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.cc

@@ -13,7 +13,7 @@
 #include <limits>
 #include <utility>
 
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
 #include "webrtc/system_wrappers/include/field_trial.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h

@@ -13,10 +13,10 @@
 
 #include <memory>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/common_audio/smoothing_filter.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/util/threshold_curve.h"
-#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.cc

@@ -13,7 +13,7 @@
 #include <limits>
 #include <utility>
 
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h

@@ -13,9 +13,9 @@
 
 #include <memory>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/util/threshold_curve.h"
-#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.cc

@@ -12,8 +12,8 @@
 
 #include <utility>
 
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
-#include "webrtc/rtc_base/logging.h"
+#include "webrtc/base/logging.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.h

@@ -14,8 +14,8 @@
 #include <map>
 #include <vector>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/controller.h"
-#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h

@@ -11,7 +11,7 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_INCLUDE_AUDIO_NETWORK_ADAPTOR_H_
 #define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_INCLUDE_AUDIO_NETWORK_ADAPTOR_H_
 
-#include "webrtc/rtc_base/optional.h"
+#include "webrtc/base/optional.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/audio_network_adaptor/util/threshold_curve.h

@@ -11,7 +11,7 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_UTIL_THRESHOLD_CURVE_H_
 #define WEBRTC_MODULES_AUDIO_CODING_AUDIO_NETWORK_ADAPTOR_UTIL_THRESHOLD_CURVE_H_
 
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/audio_format_conversion.cc

@@ -12,11 +12,11 @@
 
 #include <string.h>
 
-#include "webrtc/rtc_base/array_view.h"
+#include "webrtc/base/array_view.h"
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
-#include "webrtc/rtc_base/optional.h"
+#include "webrtc/base/optional.h"
-#include "webrtc/rtc_base/safe_conversions.h"
+#include "webrtc/base/safe_conversions.h"
-#include "webrtc/rtc_base/sanitizer.h"
+#include "webrtc/base/sanitizer.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory_internal.cc

@@ -13,11 +13,11 @@
 #include <memory>
 #include <vector>
 
+#include "webrtc/base/checks.h"
+#include "webrtc/base/optional.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h"
 #include "webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/optional.h"
 #ifdef WEBRTC_CODEC_G722
 #include "webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h"
 #endif

webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory_internal.h

@@ -12,7 +12,7 @@
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_BUILTIN_AUDIO_DECODER_FACTORY_INTERNAL_H_
 
 #include "webrtc/api/audio_codecs/audio_decoder_factory.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory_internal.cc

@@ -13,11 +13,11 @@
 #include <memory>
 #include <vector>
 
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/optional.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
-#include "webrtc/rtc_base/optional.h"
 #ifdef WEBRTC_CODEC_G722
 #include "webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.h"
 #endif

webrtc/modules/audio_coding/codecs/builtin_audio_encoder_factory_internal.h

@@ -12,7 +12,7 @@
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_BUILTIN_AUDIO_ENCODER_FACTORY_INTERNAL_H_
 
 #include "webrtc/api/audio_codecs/audio_encoder_factory.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
+#include "webrtc/base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h

@@ -15,9 +15,9 @@
 #include <vector>
 
 #include "webrtc/api/audio_codecs/audio_encoder.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/common_audio/vad/include/vad.h"
 #include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h"
-#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng_unittest.cc

@@ -11,9 +11,9 @@
 #include <memory>
 #include <vector>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/common_audio/vad/mock/mock_vad.h"
 #include "webrtc/modules/audio_coding/codecs/cng/audio_encoder_cng.h"
-#include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/mock_audio_encoder.h"
 

webrtc/modules/audio_coding/codecs/cng/webrtc_cng.cc

@@ -12,8 +12,8 @@
 
 #include <algorithm>
 
+#include "webrtc/base/safe_conversions.h"
 #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
-#include "webrtc/rtc_base/safe_conversions.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h

@@ -14,8 +14,8 @@
 
 #include <cstddef>
 
-#include "webrtc/rtc_base/array_view.h"
+#include "webrtc/base/array_view.h"
-#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/base/buffer.h"
 #include "webrtc/typedefs.h"
 
 #define WEBRTC_CNG_MAX_LPC_ORDER 12

webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h

@@ -12,8 +12,8 @@
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_G711_AUDIO_DECODER_PCM_H_
 
 #include "webrtc/api/audio_codecs/audio_decoder.h"
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
-#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.cc

@@ -13,10 +13,10 @@
 #include <algorithm>
 #include <limits>
 
+#include "webrtc/base/checks.h"
+#include "webrtc/base/string_to_number.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/codecs/g711/g711_interface.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/string_to_number.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h

@@ -15,7 +15,7 @@
 
 #include "webrtc/api/audio_codecs/audio_encoder.h"
 #include "webrtc/api/audio_codecs/audio_format.h"
-#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.cc

@@ -12,9 +12,9 @@
 
 #include <string.h>
 
-#include "webrtc/modules/audio_coding/codecs/g722/g722_interface.h"
+#include "webrtc/base/checks.h"
 #include "webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h"
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/modules/audio_coding/codecs/g722/g722_interface.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h

@@ -12,7 +12,7 @@
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_G722_AUDIO_DECODER_G722_H_
 
 #include "webrtc/api/audio_codecs/audio_decoder.h"
-#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/base/constructormagic.h"
 
 typedef struct WebRtcG722DecInst G722DecInst;
 

webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.cc

@@ -13,11 +13,11 @@
 #include <algorithm>
 
 #include <limits>
+#include "webrtc/base/checks.h"
+#include "webrtc/base/safe_conversions.h"
+#include "webrtc/base/string_to_number.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/codecs/g722/g722_interface.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/safe_conversions.h"
-#include "webrtc/rtc_base/string_to_number.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/g722/audio_encoder_g722.h

@@ -16,9 +16,9 @@
 #include "webrtc/api/audio_codecs/audio_encoder.h"
 #include "webrtc/api/audio_codecs/audio_format.h"
 #include "webrtc/api/audio_codecs/g722/audio_encoder_g722_config.h"
+#include "webrtc/base/buffer.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/codecs/g722/g722_interface.h"
-#include "webrtc/rtc_base/buffer.h"
-#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.cc

@@ -12,10 +12,10 @@
 
 #include <utility>
 
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
 #include "webrtc/modules/audio_coding/codecs/ilbc/ilbc.h"
 #include "webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/logging.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/ilbc/audio_decoder_ilbc.h

@@ -12,7 +12,7 @@
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ILBC_AUDIO_DECODER_ILBC_H_
 
 #include "webrtc/api/audio_codecs/audio_decoder.h"
-#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/base/constructormagic.h"
 
 typedef struct iLBC_decinst_t_ IlbcDecoderInstance;
 

webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.cc

@@ -12,11 +12,11 @@
 
 #include <algorithm>
 #include <limits>
+#include "webrtc/base/checks.h"
+#include "webrtc/base/safe_conversions.h"
+#include "webrtc/base/string_to_number.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/codecs/ilbc/ilbc.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/safe_conversions.h"
-#include "webrtc/rtc_base/string_to_number.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/ilbc/audio_encoder_ilbc.h

@@ -14,8 +14,8 @@
 #include "webrtc/api/audio_codecs/audio_encoder.h"
 #include "webrtc/api/audio_codecs/audio_format.h"
 #include "webrtc/api/audio_codecs/ilbc/audio_encoder_ilbc_config.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/codecs/ilbc/ilbc.h"
-#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/isac/audio_decoder_isac_t.h

@@ -14,10 +14,10 @@
 #include <vector>
 
 #include "webrtc/api/audio_codecs/audio_decoder.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/optional.h"
+#include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/optional.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/isac/audio_decoder_isac_t_impl.h

@@ -13,7 +13,7 @@
 
 #include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_decoder_isac.h"
 
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h

@@ -15,9 +15,9 @@
 
 #include "webrtc/api/audio_codecs/audio_encoder.h"
 #include "webrtc/api/audio_codecs/audio_format.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/scoped_ref_ptr.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t_impl.h

@@ -11,9 +11,9 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_ENCODER_ISAC_T_IMPL_H_
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_ENCODER_ISAC_T_IMPL_H_
 
+#include "webrtc/base/checks.h"
+#include "webrtc/base/string_to_number.h"
 #include "webrtc/common_types.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/string_to_number.h"
 
 namespace webrtc {
 namespace {  // NOLINT (not a "regular" header file)

webrtc/modules/audio_coding/codecs/isac/fix/source/isac_fix_type.h

@@ -11,8 +11,8 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_ISAC_FIX_TYPE_H_
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_FIX_SOURCE_ISAC_FIX_TYPE_H_
 
+#include "webrtc/base/checks.h"
 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/isacfix.h"
-#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h

@@ -11,10 +11,10 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_LOCKED_BANDWIDTH_INFO_H_
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_LOCKED_BANDWIDTH_INFO_H_
 
+#include "webrtc/base/atomicops.h"
+#include "webrtc/base/criticalsection.h"
+#include "webrtc/base/thread_annotations.h"
 #include "webrtc/modules/audio_coding/codecs/isac/bandwidth_info.h"
-#include "webrtc/rtc_base/atomicops.h"
-#include "webrtc/rtc_base/criticalsection.h"
-#include "webrtc/rtc_base/thread_annotations.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/isac/main/test/ReleaseTest-API/ReleaseTest-API.cc

@@ -21,7 +21,7 @@
 /* include API */
 #include "isac.h"
 #include "utility.h"
-#include "webrtc/rtc_base/format_macros.h"
+#include "webrtc/base/format_macros.h"
 
 /* Defines */
 #define SEED_FILE "randseed.txt" /* Used when running decoder on garbage data */

webrtc/modules/audio_coding/codecs/isac/unittest.cc

@@ -13,10 +13,10 @@
 #include <sstream>
 #include <vector>
 
+#include "webrtc/base/buffer.h"
 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/audio_encoder_isacfix.h"
 #include "webrtc/modules/audio_coding/codecs/isac/main/include/audio_encoder_isac.h"
 #include "webrtc/modules/audio_coding/neteq/tools/input_audio_file.h"
-#include "webrtc/rtc_base/buffer.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/testsupport/fileutils.h"
 

webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h

@@ -14,7 +14,7 @@
 #include <vector>
 
 #include "webrtc/api/audio_codecs/audio_decoder.h"
-#include "webrtc/rtc_base/array_view.h"
+#include "webrtc/base/array_view.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.cc

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

webrtc/modules/audio_coding/codecs/opus/audio_decoder_opus.h

@@ -12,8 +12,8 @@
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_OPUS_AUDIO_DECODER_OPUS_H_
 
 #include "webrtc/api/audio_codecs/audio_decoder.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h"
-#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.cc

@@ -14,20 +14,20 @@
 #include <iterator>
 #include <utility>
 
+#include "webrtc/base/arraysize.h"
+#include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/numerics/exp_filter.h"
+#include "webrtc/base/protobuf_utils.h"
+#include "webrtc/base/ptr_util.h"
+#include "webrtc/base/safe_conversions.h"
+#include "webrtc/base/safe_minmax.h"
+#include "webrtc/base/string_to_number.h"
+#include "webrtc/base/timeutils.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h"
 #include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h"
-#include "webrtc/rtc_base/arraysize.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/protobuf_utils.h"
-#include "webrtc/rtc_base/ptr_util.h"
-#include "webrtc/rtc_base/safe_conversions.h"
-#include "webrtc/rtc_base/safe_minmax.h"
-#include "webrtc/rtc_base/string_to_number.h"
-#include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/system_wrappers/include/field_trial.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h

@@ -19,12 +19,12 @@
 #include "webrtc/api/audio_codecs/audio_encoder.h"
 #include "webrtc/api/audio_codecs/audio_format.h"
 #include "webrtc/api/audio_codecs/opus/audio_encoder_opus_config.h"
+#include "webrtc/base/constructormagic.h"
+#include "webrtc/base/optional.h"
+#include "webrtc/base/protobuf_utils.h"
 #include "webrtc/common_audio/smoothing_filter.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
 #include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h"
-#include "webrtc/rtc_base/constructormagic.h"
-#include "webrtc/rtc_base/optional.h"
-#include "webrtc/rtc_base/protobuf_utils.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus_unittest.cc

@@ -12,13 +12,13 @@
 #include <memory>
 #include <utility>
 
+#include "webrtc/base/checks.h"
+#include "webrtc/base/fakeclock.h"
 #include "webrtc/common_audio/mocks/mock_smoothing_filter.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_audio_network_adaptor.h"
 #include "webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h"
 #include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/fakeclock.h"
 #include "webrtc/test/field_trial.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"

webrtc/modules/audio_coding/codecs/opus/opus_complexity_unittest.cc

@@ -8,10 +8,10 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
+#include "webrtc/base/format_macros.h"
+#include "webrtc/base/timeutils.h"
 #include "webrtc/modules/audio_coding/codecs/opus/audio_encoder_opus.h"
 #include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h"
-#include "webrtc/rtc_base/format_macros.h"
-#include "webrtc/rtc_base/timeutils.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/testsupport/fileutils.h"
 #include "webrtc/test/testsupport/perf_test.h"

webrtc/modules/audio_coding/codecs/opus/opus_fec_test.cc

@@ -10,8 +10,8 @@
 
 #include <memory>
 
+#include "webrtc/base/format_macros.h"
 #include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h"
-#include "webrtc/rtc_base/format_macros.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/testsupport/fileutils.h"
 

webrtc/modules/audio_coding/codecs/opus/opus_inst.h

@@ -13,7 +13,7 @@
 
 #include <stddef.h>
 
-#include "webrtc/rtc_base/ignore_wundef.h"
+#include "webrtc/base/ignore_wundef.h"
 
 RTC_PUSH_IGNORING_WUNDEF()
 #include "opus.h"

webrtc/modules/audio_coding/codecs/opus/opus_unittest.cc

@@ -11,10 +11,10 @@
 #include <memory>
 #include <string>
 
+#include "webrtc/base/checks.h"
 #include "webrtc/modules/audio_coding/codecs/opus/opus_inst.h"
 #include "webrtc/modules/audio_coding/codecs/opus/opus_interface.h"
 #include "webrtc/modules/audio_coding/neteq/tools/audio_loop.h"
-#include "webrtc/rtc_base/checks.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/testsupport/fileutils.h"
 

webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.cc

@@ -10,9 +10,9 @@
 
 #include "webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h"
 
+#include "webrtc/base/checks.h"
 #include "webrtc/modules/audio_coding/codecs/legacy_encoded_audio_frame.h"
 #include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h"
-#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/pcm16b/audio_decoder_pcm16b.h

@@ -12,7 +12,7 @@
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_PCM16B_AUDIO_DECODER_PCM16B_H_
 
 #include "webrtc/api/audio_codecs/audio_decoder.h"
-#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.cc

@@ -12,11 +12,11 @@
 
 #include <algorithm>
 
+#include "webrtc/base/checks.h"
+#include "webrtc/base/safe_conversions.h"
+#include "webrtc/base/string_to_number.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h"
-#include "webrtc/rtc_base/checks.h"
-#include "webrtc/rtc_base/safe_conversions.h"
-#include "webrtc/rtc_base/string_to_number.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h

@@ -11,8 +11,8 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_PCM16B_AUDIO_ENCODER_PCM16B_H_
 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_PCM16B_AUDIO_ENCODER_PCM16B_H_
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/codecs/g711/audio_encoder_pcm.h"
-#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.cc

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

webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h

@@ -15,8 +15,8 @@
 #include <vector>
 
 #include "webrtc/api/audio_codecs/audio_encoder.h"
-#include "webrtc/rtc_base/buffer.h"
+#include "webrtc/base/buffer.h"
-#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red_unittest.cc

@@ -11,8 +11,8 @@
 #include <memory>
 #include <vector>
 
+#include "webrtc/base/checks.h"
 #include "webrtc/modules/audio_coding/codecs/red/audio_encoder_copy_red.h"
-#include "webrtc/rtc_base/checks.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/mock_audio_encoder.h"
 

webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.cc

@@ -10,7 +10,7 @@
 
 #include "webrtc/modules/audio_coding/codecs/tools/audio_codec_speed_test.h"
 
-#include "webrtc/rtc_base/format_macros.h"
+#include "webrtc/base/format_macros.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/testsupport/fileutils.h"
 

webrtc/modules/audio_coding/include/audio_coding_module.h

@@ -17,13 +17,13 @@
 
 #include "webrtc/api/audio_codecs/audio_decoder_factory.h"
 #include "webrtc/api/audio_codecs/audio_encoder.h"
+#include "webrtc/base/deprecation.h"
+#include "webrtc/base/function_view.h"
+#include "webrtc/base/optional.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module_typedefs.h"
 #include "webrtc/modules/audio_coding/neteq/include/neteq.h"
 #include "webrtc/modules/include/module.h"
-#include "webrtc/rtc_base/deprecation.h"
-#include "webrtc/rtc_base/function_view.h"
-#include "webrtc/rtc_base/optional.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/typedefs.h"
 

webrtc/modules/audio_coding/neteq/accelerate.h

@@ -13,9 +13,9 @@
 
 #include <assert.h>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
 #include "webrtc/modules/audio_coding/neteq/time_stretch.h"
-#include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/neteq/audio_decoder_impl.cc

@@ -12,8 +12,8 @@
 
 #include <assert.h>
 
+#include "webrtc/base/checks.h"
 #include "webrtc/modules/audio_coding/codecs/g711/audio_decoder_pcm.h"
-#include "webrtc/rtc_base/checks.h"
 #ifdef WEBRTC_CODEC_G722
 #include "webrtc/modules/audio_coding/codecs/g722/audio_decoder_g722.h"
 #endif

webrtc/modules/audio_coding/neteq/audio_decoder_impl.h

@@ -14,8 +14,8 @@
 #include <assert.h>
 
 #include "webrtc/api/audio_codecs/audio_decoder.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/neteq/neteq_decoder_enum.h"
-#include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/typedefs.h"
 
 #ifdef WEBRTC_CODEC_G722

webrtc/modules/audio_coding/neteq/audio_multi_vector.cc

@@ -14,7 +14,7 @@
 
 #include <algorithm>
 
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/neteq/audio_multi_vector.h

@@ -15,8 +15,8 @@
 
 #include <vector>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/neteq/audio_vector.h"
-#include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/neteq/audio_vector.cc

@@ -15,7 +15,7 @@
 #include <algorithm>
 #include <memory>
 
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/neteq/audio_vector.h

@@ -14,8 +14,8 @@
 #include <string.h>  // Access to size_t.
 #include <memory>
 
-#include "webrtc/rtc_base/checks.h"
+#include "webrtc/base/checks.h"
-#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/neteq/background_noise.h

@@ -14,9 +14,9 @@
 #include <string.h>  // size_t
 #include <memory>
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
 #include "webrtc/modules/audio_coding/neteq/include/neteq.h"
-#include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/neteq/buffer_level_filter.h

@@ -13,7 +13,7 @@
 
 #include <stddef.h>
 
-#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/neteq/comfort_noise.cc

@@ -13,10 +13,10 @@
 #include <assert.h>
 
 #include "webrtc/api/audio_codecs/audio_decoder.h"
+#include "webrtc/base/logging.h"
 #include "webrtc/modules/audio_coding/neteq/decoder_database.h"
 #include "webrtc/modules/audio_coding/neteq/dsp_helper.h"
 #include "webrtc/modules/audio_coding/neteq/sync_buffer.h"
-#include "webrtc/rtc_base/logging.h"
 
 namespace webrtc {
 

webrtc/modules/audio_coding/neteq/comfort_noise.h

@@ -11,8 +11,8 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_COMFORT_NOISE_H_
 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_COMFORT_NOISE_H_
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
-#include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/neteq/decision_logic.h

@@ -11,10 +11,10 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_H_
 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_H_
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/neteq/defines.h"
 #include "webrtc/modules/audio_coding/neteq/include/neteq.h"
 #include "webrtc/modules/audio_coding/neteq/tick_timer.h"
-#include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/modules/audio_coding/neteq/decision_logic_fax.h

@@ -11,8 +11,8 @@
 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_FAX_H_
 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_DECISION_LOGIC_FAX_H_
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/neteq/decision_logic.h"
-#include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {