Revert "Update includes for webrtc/{base => rtc_base} rename (2/3)"
This reverts commit c3771cc4d37f5573fe53b7c7cff295a4f0f9560f.
(breaks downstream internal project)
BUG=webrtc:7634
NOTRY=True
NOPRESUBMIT=True
Review-Url: https://codereview.webrtc.org/2972463002 .
Cr-Commit-Position: refs/heads/master@{#18873}
diff --git a/webrtc/rtc_tools/event_log_visualizer/analyzer.cc b/webrtc/rtc_tools/event_log_visualizer/analyzer.cc
index 78993f4..a9fdce6 100644
--- a/webrtc/rtc_tools/event_log_visualizer/analyzer.cc
+++ b/webrtc/rtc_tools/event_log_visualizer/analyzer.cc
@@ -17,6 +17,11 @@
#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"
@@ -38,11 +43,6 @@
#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 0c3fa46..cdc81f1 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 6e78c89..6ceeeec 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 8bf3533..f1924b6 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/rtc_base/checks.h"
+#include "webrtc/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 e4670db..cd9fd91 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/rtc_base/ignore_wundef.h"
+#include "webrtc/base/ignore_wundef.h"
RTC_PUSH_IGNORING_WUNDEF()
#include "webrtc/rtc_tools/event_log_visualizer/chart.pb.h"
RTC_POP_IGNORING_WUNDEF()