Update includes for webrtc/{base => rtc_base} rename (1/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"`

The only manual edit is to add an include of webrtc/rtc_base/checks.h in
webrtc/modules/audio_device/android/opensles_common.h, which likely
was needed due to changed include paths due to 'git cl format'.

BUG=webrtc:7634
NOTRY=True
NOPRESUBMIT=True

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

webrtc/modules/remote_bitrate_estimator/aimd_rate_control.cc

@@ -14,8 +14,8 @@
 #include <cassert>
 #include <cmath>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/safe_minmax.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/safe_minmax.h"
 
 #include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h"

webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h

@@ -11,8 +11,8 @@
 #ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_AIMD_RATE_CONTROL_H_
 #define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_AIMD_RATE_CONTROL_H_
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc

@@ -10,15 +10,14 @@
 
 #include <memory>
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h"
+#include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/testsupport/fileutils.h"
 
-
 namespace webrtc {
 namespace testing {
 namespace bwe {

webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h

@@ -11,7 +11,7 @@
 #ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_BWE_DEFINES_H_
 #define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_INCLUDE_BWE_DEFINES_H_
 
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/optional.h"
 #include "webrtc/typedefs.h"
 
 #define BWE_MAX(a, b) ((a) > (b) ? (a) : (b))

webrtc/modules/remote_bitrate_estimator/include/send_time_history.h

@@ -13,9 +13,9 @@
 
 #include <map>
 
-#include "webrtc/base/basictypes.h"
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/basictypes.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 class Clock;

webrtc/modules/remote_bitrate_estimator/inter_arrival.cc

@@ -13,8 +13,8 @@
 #include <algorithm>
 #include <cassert>
 
-#include "webrtc/base/logging.h"
 #include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace webrtc {
 

webrtc/modules/remote_bitrate_estimator/inter_arrival.h

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

webrtc/modules/remote_bitrate_estimator/overuse_detector.cc

@@ -17,12 +17,12 @@
 #include <sstream>
 #include <string>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/safe_minmax.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/safe_minmax.h"
 #include "webrtc/system_wrappers/include/field_trial.h"
 
 namespace webrtc {

webrtc/modules/remote_bitrate_estimator/overuse_detector.h

@@ -12,9 +12,9 @@
 
 #include <list>
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h"
+#include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {

webrtc/modules/remote_bitrate_estimator/overuse_detector_unittest.cc

@@ -15,12 +15,12 @@
 #include <cstdlib>
 #include <memory>
 
-#include "webrtc/base/random.h"
-#include "webrtc/base/rate_statistics.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/remote_bitrate_estimator/inter_arrival.h"
 #include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h"
 #include "webrtc/modules/remote_bitrate_estimator/overuse_estimator.h"
+#include "webrtc/rtc_base/random.h"
+#include "webrtc/rtc_base/rate_statistics.h"
 #include "webrtc/test/field_trial.h"
 #include "webrtc/test/gtest.h"
 

webrtc/modules/remote_bitrate_estimator/overuse_estimator.cc

@@ -17,9 +17,9 @@
 
 #include <algorithm>
 
-#include "webrtc/base/logging.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace webrtc {
 

webrtc/modules/remote_bitrate_estimator/overuse_estimator.h

@@ -12,9 +12,9 @@
 
 #include <deque>
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.cc

@@ -14,12 +14,12 @@
 
 #include <algorithm>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/thread_annotations.h"
 #include "webrtc/modules/pacing/paced_sender.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/thread_annotations.h"
 #include "webrtc/system_wrappers/include/metrics.h"
 #include "webrtc/typedefs.h"
 

webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h

@@ -16,16 +16,16 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/rate_statistics.h"
-#include "webrtc/base/thread_checker.h"
 #include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
 #include "webrtc/modules/remote_bitrate_estimator/inter_arrival.h"
 #include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h"
 #include "webrtc/modules/remote_bitrate_estimator/overuse_estimator.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/rate_statistics.h"
+#include "webrtc/rtc_base/thread_checker.h"
 
 namespace webrtc {
 

webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time_unittest.cc

@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_abs_send_time.h"
 #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.cc

@@ -12,13 +12,13 @@
 
 #include <utility>
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/thread_annotations.h"
 #include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h"
 #include "webrtc/modules/remote_bitrate_estimator/inter_arrival.h"
 #include "webrtc/modules/remote_bitrate_estimator/overuse_detector.h"
 #include "webrtc/modules/remote_bitrate_estimator/overuse_estimator.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/thread_annotations.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/system_wrappers/include/metrics.h"
 #include "webrtc/typedefs.h"

webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h

@@ -15,11 +15,11 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
-#include "webrtc/base/rate_statistics.h"
 #include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/criticalsection.h"
+#include "webrtc/rtc_base/rate_statistics.h"
 
 namespace webrtc {
 

webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream_unittest.cc

@@ -8,9 +8,9 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_single_stream.h"
 #include "webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.cc

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

webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_unittest_helper.h

@@ -17,8 +17,8 @@
 #include <utility>
 #include <vector>
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
+#include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/test/gtest.h"
 

webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc

@@ -16,12 +16,12 @@
 #include <algorithm>
 #include <sstream>
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/random.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/random.h"
 #include "webrtc/test/testsupport/fileutils.h"
 
 namespace webrtc {

webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.cc

@@ -13,12 +13,12 @@
 #include <limits>
 #include <algorithm>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/safe_minmax.h"
 #include "webrtc/modules/pacing/packet_router.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/safe_minmax.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
 namespace webrtc {

webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h

@@ -14,9 +14,9 @@
 #include <map>
 #include <vector>
 
-#include "webrtc/base/criticalsection.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
+#include "webrtc/rtc_base/criticalsection.h"
 
 namespace webrtc {
 

webrtc/modules/remote_bitrate_estimator/send_time_history.cc

@@ -10,8 +10,8 @@
 
 #include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h"
 
-#include "webrtc/base/checks.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "webrtc/rtc_base/checks.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
 namespace webrtc {

webrtc/modules/remote_bitrate_estimator/test/bwe.cc

@@ -12,12 +12,12 @@
 
 #include <limits>
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/estimators/bbr.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/estimators/tcp.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 namespace testing {

webrtc/modules/remote_bitrate_estimator/test/bwe.h

@@ -16,11 +16,11 @@
 #include <sstream>
 #include <string>
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/gtest_prod_util.h"
-#include "webrtc/modules/remote_bitrate_estimator/test/packet.h"
 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h"
+#include "webrtc/modules/remote_bitrate_estimator/test/packet.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/gtest_prod_util.h"
 
 namespace webrtc {
 namespace testing {

webrtc/modules/remote_bitrate_estimator/test/bwe_test.cc

@@ -13,12 +13,12 @@
 #include <memory>
 #include <sstream>
 
-#include "webrtc/base/arraysize.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h"
+#include "webrtc/rtc_base/arraysize.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/system_wrappers/include/field_trial.h"
 #include "webrtc/test/testsupport/perf_test.h"

webrtc/modules/remote_bitrate_estimator/test/bwe_test.h

@@ -15,10 +15,10 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h"
+#include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {

webrtc/modules/remote_bitrate_estimator/test/bwe_test_baselinefile.cc

@@ -16,9 +16,9 @@
 #include <memory>
 #include <vector>
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h"
+#include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/test/testsupport/fileutils.h"
 
 namespace webrtc {

webrtc/modules/remote_bitrate_estimator/test/bwe_test_fileutils.h

@@ -15,8 +15,8 @@
 
 #include <string>
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 namespace testing {

webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc

@@ -14,8 +14,8 @@
 
 #include <sstream>
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/safe_minmax.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/safe_minmax.h"
 
 namespace webrtc {
 namespace testing {

webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h

@@ -24,8 +24,6 @@
 #include <utility>
 #include <vector>
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/random.h"
 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/pacing/paced_sender.h"
@@ -33,6 +31,8 @@
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/packet.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/random.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/typedefs.h"
 

webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc

@@ -12,9 +12,9 @@
 
 #include <numeric>
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/packet.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h"
+#include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/testsupport/fileutils.h"
 

webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.cc

@@ -18,9 +18,9 @@
 #include <algorithm>
 #include <sstream>
 
-#include "webrtc/base/checks.h"
-#include "webrtc/base/format_macros.h"
-#include "webrtc/base/platform_thread.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/format_macros.h"
+#include "webrtc/rtc_base/platform_thread.h"
 
 namespace webrtc {
 namespace testing {

webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h

@@ -128,9 +128,9 @@
 #include <stack>
 #include <string>
 
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/criticalsection.h"
 #include "webrtc/common_types.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/criticalsection.h"
 
 #define BWE_TEST_LOGGING_GLOBAL_CONTEXT(name) \
     do { \

webrtc/modules/remote_bitrate_estimator/test/bwe_unittest.cc

@@ -12,7 +12,7 @@
 
 #include <vector>
 
-#include "webrtc/base/arraysize.h"
+#include "webrtc/rtc_base/arraysize.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {

webrtc/modules/remote_bitrate_estimator/test/estimators/bbr.cc

@@ -15,9 +15,9 @@
 #include <algorithm>
 #include <utility>
 
-#include "webrtc/base/logging.h"
 #include "webrtc/modules/congestion_controller/delay_based_bwe.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h"
+#include "webrtc/rtc_base/logging.h"
 
 namespace webrtc {
 namespace testing {

webrtc/modules/remote_bitrate_estimator/test/estimators/nada.cc

@@ -18,10 +18,10 @@
 #include <algorithm>
 #include <vector>
 
-#include "webrtc/base/arraysize.h"
-#include "webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h"
+#include "webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h"
 #include "webrtc/modules/rtp_rtcp/include/receive_statistics.h"
+#include "webrtc/rtc_base/arraysize.h"
 
 namespace webrtc {
 namespace testing {

webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h

@@ -21,9 +21,9 @@
 #include <map>
 #include <memory>
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe.h"
+#include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/voice_engine/channel.h"
 
 namespace webrtc {

webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc

@@ -14,11 +14,11 @@
 #include <memory>
 #include <numeric>
 
-#include "webrtc/base/arraysize.h"
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/packet.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h"
+#include "webrtc/rtc_base/arraysize.h"
+#include "webrtc/rtc_base/constructormagic.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/testsupport/fileutils.h"
 

webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h

@@ -15,9 +15,9 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 

webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.cc

@@ -12,10 +12,10 @@
 
 #include <algorithm>
 
-#include "webrtc/base/logging.h"
-#include "webrtc/base/ptr_util.h"
 #include "webrtc/modules/congestion_controller/delay_based_bwe.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/ptr_util.h"
 
 namespace webrtc {
 namespace testing {

webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h

@@ -16,7 +16,7 @@
 #include <string>
 #include <vector>
 
-#include "webrtc/base/gtest_prod_util.h"
+#include "webrtc/rtc_base/gtest_prod_util.h"
 
 namespace webrtc {
 namespace testing {

webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h

@@ -14,10 +14,10 @@
 #include <memory>
 #include <string>
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 namespace testing {

webrtc/modules/remote_bitrate_estimator/test/packet_sender.cc

@@ -14,10 +14,10 @@
 #include <list>
 #include <sstream>
 
-#include "webrtc/base/checks.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h"
+#include "webrtc/rtc_base/checks.h"
 
 namespace webrtc {
 namespace testing {

webrtc/modules/remote_bitrate_estimator/test/packet_sender.h

@@ -17,10 +17,10 @@
 #include <set>
 #include <string>
 
-#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/include/module.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h"
+#include "webrtc/rtc_base/constructormagic.h"
 
 namespace webrtc {
 namespace testing {

webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp_play.cc

@@ -12,11 +12,11 @@
 
 #include <memory>
 
-#include "webrtc/base/format_macros.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h"
 #include "webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h"
+#include "webrtc/rtc_base/format_macros.h"
 #include "webrtc/test/rtp_file_reader.h"
 
 class Observer : public webrtc::RemoteBitrateObserver {

webrtc/modules/remote_bitrate_estimator/tools/rtp_to_text.cc

@@ -13,10 +13,10 @@
 #include <memory>
 #include <sstream>
 
-#include "webrtc/base/format_macros.h"
 #include "webrtc/modules/remote_bitrate_estimator/tools/bwe_rtp.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_header_parser.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h"
+#include "webrtc/rtc_base/format_macros.h"
 #include "webrtc/test/rtp_file_reader.h"
 
 int main(int argc, char** argv) {