Delete deprecated rtc_event_log header
Bug: webrtc:10206
Change-Id: I9ed3148843c647372993729b87c0e74741ab540b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/147870
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28791}
diff --git a/logging/BUILD.gn b/logging/BUILD.gn
index cd7caea..537c069 100644
--- a/logging/BUILD.gn
+++ b/logging/BUILD.gn
@@ -30,7 +30,6 @@
sources = [
"rtc_event_log/encoder/rtc_event_log_encoder.h",
"rtc_event_log/events/rtc_event.h",
- "rtc_event_log/rtc_event_log.h",
"rtc_event_log/rtc_event_log_factory_interface.h",
]
@@ -277,6 +276,7 @@
deps = [
":ice_log",
":rtc_event_log_api",
+ "../api/rtc_event_log",
"../rtc_base",
"../rtc_base:checks",
]
@@ -314,13 +314,13 @@
":ice_log",
":rtc_event_bwe",
":rtc_event_log2_proto",
- ":rtc_event_log_api",
":rtc_event_log_impl_encoder",
":rtc_event_log_proto",
":rtc_stream_config",
"../api:function_view",
"../api:libjingle_peerconnection_api",
"../api:rtp_headers",
+ "../api/rtc_event_log",
"../api/units:data_rate",
"../api/units:time_delta",
"../api/units:timestamp",
@@ -361,7 +361,6 @@
":rtc_event_bwe",
":rtc_event_generic_packet_events",
":rtc_event_log2_proto",
- ":rtc_event_log_api",
":rtc_event_log_impl_encoder",
":rtc_event_log_parser",
":rtc_event_log_proto",
@@ -373,6 +372,7 @@
"../api:libjingle_peerconnection_api",
"../api:rtc_event_log_output_file",
"../api:rtp_headers",
+ "../api/rtc_event_log",
"../api/rtc_event_log:rtc_event_log_factory",
"../api/task_queue:default_task_queue_factory",
"../call",
@@ -398,11 +398,11 @@
"rtc_event_log/rtc_event_log2rtp_dump.cc",
]
deps = [
- ":rtc_event_log_api",
":rtc_event_log_parser",
"../api:array_view",
"../api:libjingle_peerconnection_api",
"../api:rtp_headers",
+ "../api/rtc_event_log",
"../modules/rtp_rtcp",
"../modules/rtp_rtcp:rtp_rtcp_format",
"../rtc_base:checks",
@@ -437,6 +437,7 @@
":rtc_event_log_api",
"../api:libjingle_logging_api",
"../api:libjingle_peerconnection_api",
+ "../api/rtc_event_log",
"../rtc_base:rtc_base_approved",
"//third_party/abseil-cpp/absl/memory",
]
@@ -450,7 +451,7 @@
"rtc_event_log/mock/mock_rtc_event_log.h",
]
deps = [
- ":rtc_event_log_api",
+ "../api/rtc_event_log",
"../test:test_support",
]
}
diff --git a/logging/rtc_event_log/fake_rtc_event_log.h b/logging/rtc_event_log/fake_rtc_event_log.h
index 8c0e498..6522fb6 100644
--- a/logging/rtc_event_log/fake_rtc_event_log.h
+++ b/logging/rtc_event_log/fake_rtc_event_log.h
@@ -14,8 +14,8 @@
#include <map>
#include <memory>
+#include "api/rtc_event_log/rtc_event_log.h"
#include "logging/rtc_event_log/events/rtc_event.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "rtc_base/async_invoker.h"
#include "rtc_base/thread.h"
diff --git a/logging/rtc_event_log/fake_rtc_event_log_factory.cc b/logging/rtc_event_log/fake_rtc_event_log_factory.cc
index 852a3c8..f84f74f 100644
--- a/logging/rtc_event_log/fake_rtc_event_log_factory.cc
+++ b/logging/rtc_event_log/fake_rtc_event_log_factory.cc
@@ -10,8 +10,8 @@
#include "logging/rtc_event_log/fake_rtc_event_log_factory.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "logging/rtc_event_log/fake_rtc_event_log.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
namespace webrtc {
diff --git a/logging/rtc_event_log/ice_logger.cc b/logging/rtc_event_log/ice_logger.cc
index 9e69b52..59076ce 100644
--- a/logging/rtc_event_log/ice_logger.cc
+++ b/logging/rtc_event_log/ice_logger.cc
@@ -11,7 +11,7 @@
#include "logging/rtc_event_log/ice_logger.h"
#include "absl/memory/memory.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
+#include "api/rtc_event_log/rtc_event_log.h"
namespace webrtc {
diff --git a/logging/rtc_event_log/mock/mock_rtc_event_log.h b/logging/rtc_event_log/mock/mock_rtc_event_log.h
index 44207ff..66a2065 100644
--- a/logging/rtc_event_log/mock/mock_rtc_event_log.h
+++ b/logging/rtc_event_log/mock/mock_rtc_event_log.h
@@ -13,7 +13,7 @@
#include <memory>
-#include "logging/rtc_event_log/rtc_event_log.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "test/gmock.h"
namespace webrtc {
diff --git a/logging/rtc_event_log/rtc_event_log.h b/logging/rtc_event_log/rtc_event_log.h
deleted file mode 100644
index 2a088f6..0000000
--- a/logging/rtc_event_log/rtc_event_log.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_H_
-#define LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_H_
-
-// TODO(bugs.webrtc.org/10206): For backwards compatibility; Delete as soon as
-// dependencies are updated.
-
-#include "api/rtc_event_log/rtc_event_log.h"
-
-namespace webrtc {
-using RtcEventLogNullImpl = ::webrtc::RtcEventLogNull;
-} // namespace webrtc
-
-#endif // LOGGING_RTC_EVENT_LOG_RTC_EVENT_LOG_H_
diff --git a/logging/rtc_event_log/rtc_event_log2rtp_dump.cc b/logging/rtc_event_log/rtc_event_log2rtp_dump.cc
index 114a1a0..51d0713 100644
--- a/logging/rtc_event_log/rtc_event_log2rtp_dump.cc
+++ b/logging/rtc_event_log/rtc_event_log2rtp_dump.cc
@@ -23,8 +23,8 @@
#include "absl/memory/memory.h"
#include "absl/types/optional.h"
#include "api/array_view.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/rtp_headers.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "logging/rtc_event_log/rtc_event_log_parser.h"
#include "logging/rtc_event_log/rtc_event_processor.h"
#include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
diff --git a/logging/rtc_event_log/rtc_event_log_parser.cc b/logging/rtc_event_log/rtc_event_log_parser.cc
index 74267af..45d4ea4 100644
--- a/logging/rtc_event_log/rtc_event_log_parser.cc
+++ b/logging/rtc_event_log/rtc_event_log_parser.cc
@@ -22,12 +22,12 @@
#include "absl/memory/memory.h"
#include "absl/types/optional.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/rtp_headers.h"
#include "api/rtp_parameters.h"
#include "logging/rtc_event_log/encoder/blob_encoding.h"
#include "logging/rtc_event_log/encoder/delta_encoding.h"
#include "logging/rtc_event_log/encoder/rtc_event_log_encoder_common.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "logging/rtc_event_log/rtc_event_processor.h"
#include "modules/audio_coding/audio_network_adaptor/include/audio_network_adaptor.h"
#include "modules/include/module_common_types.h"
diff --git a/logging/rtc_event_log/rtc_event_log_parser.h b/logging/rtc_event_log/rtc_event_log_parser.h
index 2aae9f8..72eff98 100644
--- a/logging/rtc_event_log/rtc_event_log_parser.h
+++ b/logging/rtc_event_log/rtc_event_log_parser.h
@@ -18,10 +18,10 @@
#include <utility> // pair
#include <vector>
+#include "api/rtc_event_log/rtc_event_log.h"
#include "call/video_receive_stream.h"
#include "call/video_send_stream.h"
#include "logging/rtc_event_log/logged_events.h"
-#include "logging/rtc_event_log/rtc_event_log.h"
#include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
#include "modules/rtp_rtcp/source/rtcp_packet/common_header.h"
#include "rtc_base/ignore_wundef.h"
diff --git a/logging/rtc_event_log/rtc_event_log_unittest.cc b/logging/rtc_event_log/rtc_event_log_unittest.cc
index a3a6433..e44d818 100644
--- a/logging/rtc_event_log/rtc_event_log_unittest.cc
+++ b/logging/rtc_event_log/rtc_event_log_unittest.cc
@@ -8,8 +8,6 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "logging/rtc_event_log/rtc_event_log.h"
-
#include <algorithm>
#include <limits>
#include <map>
@@ -20,6 +18,7 @@
#include <vector>
#include "absl/memory/memory.h"
+#include "api/rtc_event_log/rtc_event_log.h"
#include "api/rtc_event_log/rtc_event_log_factory.h"
#include "api/rtc_event_log_output_file.h"
#include "api/task_queue/default_task_queue_factory.h"
