Update includes for webrtc/{base => rtc_base} rename (2/3)
I used a command like this to update the paths:
perl -pi -e "s/webrtc\/base/webrtc\/rtc_base/g" `find webrtc/rtc_base -name "*.cc" -o -name "*.h"`
BUG=webrtc:7634
NOPRESUBMIT=True # cpplint errors that aren't caused by this CL.
Review-Url: https://codereview.webrtc.org/2969623003
Cr-Commit-Position: refs/heads/master@{#18870}
diff --git a/webrtc/rtc_tools/agc/activity_metric.cc b/webrtc/rtc_tools/agc/activity_metric.cc
index 8ea1939..2cca66b 100644
--- a/webrtc/rtc_tools/agc/activity_metric.cc
+++ b/webrtc/rtc_tools/agc/activity_metric.cc
@@ -16,8 +16,6 @@
#include <algorithm>
#include <memory>
-#include "webrtc/base/flags.h"
-#include "webrtc/base/safe_minmax.h"
#include "webrtc/modules/audio_processing/agc/agc.h"
#include "webrtc/modules/audio_processing/agc/loudness_histogram.h"
#include "webrtc/modules/audio_processing/agc/utility.h"
@@ -26,6 +24,8 @@
#include "webrtc/modules/audio_processing/vad/standalone_vad.h"
#include "webrtc/modules/audio_processing/vad/vad_audio_proc.h"
#include "webrtc/modules/include/module_common_types.h"
+#include "webrtc/rtc_base/flags.h"
+#include "webrtc/rtc_base/safe_minmax.h"
#include "webrtc/test/gtest.h"
static const int kAgcAnalWindowSamples = 100;
diff --git a/webrtc/rtc_tools/event_log_visualizer/analyzer.cc b/webrtc/rtc_tools/event_log_visualizer/analyzer.cc
index a9fdce6..78993f4 100644
--- a/webrtc/rtc_tools/event_log_visualizer/analyzer.cc
+++ b/webrtc/rtc_tools/event_log_visualizer/analyzer.cc
@@ -17,11 +17,6 @@
#include <string>
#include <utility>
-#include "webrtc/base/checks.h"
-#include "webrtc/base/format_macros.h"
-#include "webrtc/base/logging.h"
-#include "webrtc/base/ptr_util.h"
-#include "webrtc/base/rate_statistics.h"
#include "webrtc/call/audio_receive_stream.h"
#include "webrtc/call/audio_send_stream.h"
#include "webrtc/call/call.h"
@@ -43,6 +38,11 @@
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_header_extensions.h"
#include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/format_macros.h"
+#include "webrtc/rtc_base/logging.h"
+#include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/rate_statistics.h"
#include "webrtc/video_receive_stream.h"
#include "webrtc/video_send_stream.h"
diff --git a/webrtc/rtc_tools/event_log_visualizer/analyzer.h b/webrtc/rtc_tools/event_log_visualizer/analyzer.h
index cdc81f1..0c3fa46 100644
--- a/webrtc/rtc_tools/event_log_visualizer/analyzer.h
+++ b/webrtc/rtc_tools/event_log_visualizer/analyzer.h
@@ -18,11 +18,11 @@
#include <utility>
#include <vector>
-#include "webrtc/base/function_view.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h"
#include "webrtc/modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
+#include "webrtc/rtc_base/function_view.h"
#include "webrtc/rtc_tools/event_log_visualizer/plot_base.h"
namespace webrtc {
diff --git a/webrtc/rtc_tools/event_log_visualizer/main.cc b/webrtc/rtc_tools/event_log_visualizer/main.cc
index 6ceeeec..6e78c89 100644
--- a/webrtc/rtc_tools/event_log_visualizer/main.cc
+++ b/webrtc/rtc_tools/event_log_visualizer/main.cc
@@ -10,8 +10,8 @@
#include <iostream>
-#include "webrtc/base/flags.h"
#include "webrtc/logging/rtc_event_log/rtc_event_log_parser.h"
+#include "webrtc/rtc_base/flags.h"
#include "webrtc/rtc_tools/event_log_visualizer/analyzer.h"
#include "webrtc/rtc_tools/event_log_visualizer/plot_base.h"
#include "webrtc/rtc_tools/event_log_visualizer/plot_python.h"
diff --git a/webrtc/rtc_tools/event_log_visualizer/plot_base.cc b/webrtc/rtc_tools/event_log_visualizer/plot_base.cc
index f1924b6..8bf3533 100644
--- a/webrtc/rtc_tools/event_log_visualizer/plot_base.cc
+++ b/webrtc/rtc_tools/event_log_visualizer/plot_base.cc
@@ -12,7 +12,7 @@
#include <algorithm>
-#include "webrtc/base/checks.h"
+#include "webrtc/rtc_base/checks.h"
namespace webrtc {
namespace plotting {
diff --git a/webrtc/rtc_tools/event_log_visualizer/plot_protobuf.h b/webrtc/rtc_tools/event_log_visualizer/plot_protobuf.h
index cd9fd91..e4670db 100644
--- a/webrtc/rtc_tools/event_log_visualizer/plot_protobuf.h
+++ b/webrtc/rtc_tools/event_log_visualizer/plot_protobuf.h
@@ -10,7 +10,7 @@
#ifndef WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_
#define WEBRTC_RTC_TOOLS_EVENT_LOG_VISUALIZER_PLOT_PROTOBUF_H_
-#include "webrtc/base/ignore_wundef.h"
+#include "webrtc/rtc_base/ignore_wundef.h"
RTC_PUSH_IGNORING_WUNDEF()
#include "webrtc/rtc_tools/event_log_visualizer/chart.pb.h"
RTC_POP_IGNORING_WUNDEF()
diff --git a/webrtc/rtc_tools/network_tester/config_reader.h b/webrtc/rtc_tools/network_tester/config_reader.h
index 7d399f3..8cc1f8d 100644
--- a/webrtc/rtc_tools/network_tester/config_reader.h
+++ b/webrtc/rtc_tools/network_tester/config_reader.h
@@ -14,10 +14,10 @@
#include <fstream>
#include <string>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/optional.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/optional.h"
-#include "webrtc/base/ignore_wundef.h"
+#include "webrtc/rtc_base/ignore_wundef.h"
#ifdef WEBRTC_NETWORK_TESTER_PROTO
RTC_PUSH_IGNORING_WUNDEF()
diff --git a/webrtc/rtc_tools/network_tester/network_tester_unittest.cc b/webrtc/rtc_tools/network_tester/network_tester_unittest.cc
index 6c86a01..d3958be 100644
--- a/webrtc/rtc_tools/network_tester/network_tester_unittest.cc
+++ b/webrtc/rtc_tools/network_tester/network_tester_unittest.cc
@@ -13,7 +13,7 @@
#include "webrtc/rtc_tools/network_tester/test_controller.h"
-#include "webrtc/base/gunit.h"
+#include "webrtc/rtc_base/gunit.h"
#include "webrtc/test/gtest.h"
#include "webrtc/test/testsupport/fileutils.h"
diff --git a/webrtc/rtc_tools/network_tester/packet_logger.cc b/webrtc/rtc_tools/network_tester/packet_logger.cc
index 5a32bea..ad93e71 100644
--- a/webrtc/rtc_tools/network_tester/packet_logger.cc
+++ b/webrtc/rtc_tools/network_tester/packet_logger.cc
@@ -9,8 +9,8 @@
*/
#include "webrtc/rtc_tools/network_tester/packet_logger.h"
-#include "webrtc/base/checks.h"
-#include "webrtc/base/protobuf_utils.h"
+#include "webrtc/rtc_base/checks.h"
+#include "webrtc/rtc_base/protobuf_utils.h"
namespace webrtc {
diff --git a/webrtc/rtc_tools/network_tester/packet_logger.h b/webrtc/rtc_tools/network_tester/packet_logger.h
index 8f8f767..33ee960 100644
--- a/webrtc/rtc_tools/network_tester/packet_logger.h
+++ b/webrtc/rtc_tools/network_tester/packet_logger.h
@@ -14,8 +14,8 @@
#include <fstream>
#include <string>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/ignore_wundef.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/ignore_wundef.h"
#ifdef WEBRTC_NETWORK_TESTER_PROTO
RTC_PUSH_IGNORING_WUNDEF()
diff --git a/webrtc/rtc_tools/network_tester/packet_sender.cc b/webrtc/rtc_tools/network_tester/packet_sender.cc
index ca5b8e9..6568ba0 100644
--- a/webrtc/rtc_tools/network_tester/packet_sender.cc
+++ b/webrtc/rtc_tools/network_tester/packet_sender.cc
@@ -14,7 +14,7 @@
#include <string>
#include <utility>
-#include "webrtc/base/timeutils.h"
+#include "webrtc/rtc_base/timeutils.h"
#include "webrtc/rtc_tools/network_tester/config_reader.h"
#include "webrtc/rtc_tools/network_tester/test_controller.h"
diff --git a/webrtc/rtc_tools/network_tester/packet_sender.h b/webrtc/rtc_tools/network_tester/packet_sender.h
index 8c4e988..67fb0d7 100644
--- a/webrtc/rtc_tools/network_tester/packet_sender.h
+++ b/webrtc/rtc_tools/network_tester/packet_sender.h
@@ -14,10 +14,10 @@
#include <memory>
#include <string>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/ignore_wundef.h"
-#include "webrtc/base/sequenced_task_checker.h"
-#include "webrtc/base/task_queue.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/ignore_wundef.h"
+#include "webrtc/rtc_base/sequenced_task_checker.h"
+#include "webrtc/rtc_base/task_queue.h"
#ifdef WEBRTC_NETWORK_TESTER_PROTO
RTC_PUSH_IGNORING_WUNDEF()
diff --git a/webrtc/rtc_tools/network_tester/test_controller.h b/webrtc/rtc_tools/network_tester/test_controller.h
index 1608740..f38758d 100644
--- a/webrtc/rtc_tools/network_tester/test_controller.h
+++ b/webrtc/rtc_tools/network_tester/test_controller.h
@@ -17,10 +17,10 @@
#include <string>
#include <utility>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/ignore_wundef.h"
#include "webrtc/p2p/base/basicpacketsocketfactory.h"
#include "webrtc/p2p/base/udptransport.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/ignore_wundef.h"
#include "webrtc/rtc_tools/network_tester/packet_logger.h"
#include "webrtc/rtc_tools/network_tester/packet_sender.h"
diff --git a/webrtc/rtc_tools/simple_command_line_parser.h b/webrtc/rtc_tools/simple_command_line_parser.h
index 960038b..b8c9037 100644
--- a/webrtc/rtc_tools/simple_command_line_parser.h
+++ b/webrtc/rtc_tools/simple_command_line_parser.h
@@ -15,8 +15,8 @@
#include <string>
#include <vector>
-#include "webrtc/base/constructormagic.h"
-#include "webrtc/base/gtest_prod_util.h"
+#include "webrtc/rtc_base/constructormagic.h"
+#include "webrtc/rtc_base/gtest_prod_util.h"
// This is a very basic command line parsing class. We pass the command line
// arguments and their number and the class forms a vector out of these. Than we