From 2ca1d0f8098b035c1479efe67fb7c2b22f6bcdeb Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Fri, 1 Dec 2023 14:30:47 +0100 Subject: [PATCH] Delete legacy RtcEventLogFactory Create functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All usage was migrated to the latest variant of the Create function that takes the Environment paramter. Bug: webrtc:15656 Change-Id: I2fb2bf4bc4a858d69adc64c2804c1bd830011f10 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/329440 Reviewed-by: Björn Terelius Reviewed-by: Harald Alvestrand Commit-Queue: Danil Chapovalov Cr-Commit-Position: refs/heads/main@{#41302} --- api/rtc_event_log/BUILD.gn | 2 -- api/rtc_event_log/rtc_event_log_factory.cc | 30 ++----------------- api/rtc_event_log/rtc_event_log_factory.h | 10 +------ .../rtc_event_log_factory_interface.h | 7 ----- .../fake_rtc_event_log_factory.cc | 19 ++---------- .../fake_rtc_event_log_factory.h | 8 ----- 6 files changed, 6 insertions(+), 70 deletions(-) diff --git a/api/rtc_event_log/BUILD.gn b/api/rtc_event_log/BUILD.gn index 274c6ca75a..073c91a5e8 100644 --- a/api/rtc_event_log/BUILD.gn +++ b/api/rtc_event_log/BUILD.gn @@ -38,9 +38,7 @@ rtc_library("rtc_event_log_factory") { deps = [ ":rtc_event_log", "..:field_trials_view", - "../../rtc_base:checks", "../../rtc_base/system:rtc_export", - "../../system_wrappers:field_trial", "../environment", "../task_queue", ] diff --git a/api/rtc_event_log/rtc_event_log_factory.cc b/api/rtc_event_log/rtc_event_log_factory.cc index c77011a322..30fc6f126f 100644 --- a/api/rtc_event_log/rtc_event_log_factory.cc +++ b/api/rtc_event_log/rtc_event_log_factory.cc @@ -11,11 +11,11 @@ #include "api/rtc_event_log/rtc_event_log_factory.h" #include -#include +#include "absl/base/nullability.h" +#include "api/environment/environment.h" #include "api/field_trials_view.h" -#include "rtc_base/checks.h" -#include "system_wrappers/include/field_trial.h" +#include "api/rtc_event_log/rtc_event_log.h" #ifdef WEBRTC_ENABLE_RTC_EVENT_LOG #include "logging/rtc_event_log/rtc_event_log_impl.h" @@ -23,11 +23,6 @@ namespace webrtc { -RtcEventLogFactory::RtcEventLogFactory(TaskQueueFactory* task_queue_factory) - : task_queue_factory_(task_queue_factory) { - RTC_DCHECK(task_queue_factory_); -} - absl::Nonnull> RtcEventLogFactory::Create( const Environment& env) const { #ifndef WEBRTC_ENABLE_RTC_EVENT_LOG @@ -45,23 +40,4 @@ absl::Nonnull> RtcEventLogFactory::Create( #endif } -std::unique_ptr RtcEventLogFactory::Create( - RtcEventLog::EncodingType encoding_type) const { -#ifdef WEBRTC_ENABLE_RTC_EVENT_LOG - RTC_DCHECK(task_queue_factory_); - if (field_trial::IsEnabled("WebRTC-RtcEventLogKillSwitch")) { - return std::make_unique(); - } - return std::make_unique( - RtcEventLogImpl::CreateEncoder(encoding_type), task_queue_factory_); -#else - return std::make_unique(); -#endif -} - -std::unique_ptr RtcEventLogFactory::CreateRtcEventLog( - RtcEventLog::EncodingType encoding_type) { - return Create(encoding_type); -} - } // namespace webrtc diff --git a/api/rtc_event_log/rtc_event_log_factory.h b/api/rtc_event_log/rtc_event_log_factory.h index f0cf6d7823..21a670e1a7 100644 --- a/api/rtc_event_log/rtc_event_log_factory.h +++ b/api/rtc_event_log/rtc_event_log_factory.h @@ -29,19 +29,11 @@ class RTC_EXPORT RtcEventLogFactory : public RtcEventLogFactoryInterface { // TODO(bugs.webrtc.org/15656): deprecate and delete constructor taking // task queue factory in favor of using task queue factory provided through // the Environment parameter in Create function. - explicit RtcEventLogFactory(TaskQueueFactory* task_queue_factory); + explicit RtcEventLogFactory(TaskQueueFactory* task_queue_factory) {} ~RtcEventLogFactory() override = default; absl::Nonnull> Create( const Environment& env) const override; - - std::unique_ptr Create( - RtcEventLog::EncodingType encoding_type) const override; - std::unique_ptr CreateRtcEventLog( - RtcEventLog::EncodingType encoding_type) override; - - private: - TaskQueueFactory* const task_queue_factory_ = nullptr; }; } // namespace webrtc diff --git a/api/rtc_event_log/rtc_event_log_factory_interface.h b/api/rtc_event_log/rtc_event_log_factory_interface.h index d0374fdf35..3135584966 100644 --- a/api/rtc_event_log/rtc_event_log_factory_interface.h +++ b/api/rtc_event_log/rtc_event_log_factory_interface.h @@ -28,13 +28,6 @@ class RtcEventLogFactoryInterface { virtual absl::Nonnull> Create( const Environment& env) const = 0; - - // TODO(bugs.webrtc.org/15656): Delete functions below when all usage is - // migrated to the Create(const Environment&) function above. - virtual std::unique_ptr Create( - RtcEventLog::EncodingType encoding_type) const = 0; - [[deprecated]] virtual std::unique_ptr CreateRtcEventLog( - RtcEventLog::EncodingType encoding_type) = 0; }; } // namespace webrtc 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 9a27b63f2d..bacc3cd1cb 100644 --- a/logging/rtc_event_log/fake_rtc_event_log_factory.cc +++ b/logging/rtc_event_log/fake_rtc_event_log_factory.cc @@ -17,26 +17,11 @@ namespace webrtc { -absl::Nonnull> -FakeRtcEventLogFactory::CreateFake() const { +absl::Nonnull> FakeRtcEventLogFactory::Create( + const Environment& /*env*/) const { auto fake_event_log = std::make_unique(); const_cast(last_log_created_) = fake_event_log.get(); return fake_event_log; } -std::unique_ptr FakeRtcEventLogFactory::Create( - const Environment& /*env*/) const { - return CreateFake(); -} - -std::unique_ptr FakeRtcEventLogFactory::Create( - RtcEventLog::EncodingType /*encoding_type*/) const { - return CreateFake(); -} - -std::unique_ptr FakeRtcEventLogFactory::CreateRtcEventLog( - RtcEventLog::EncodingType /*encoding_type*/) { - return CreateFake(); -} - } // namespace webrtc diff --git a/logging/rtc_event_log/fake_rtc_event_log_factory.h b/logging/rtc_event_log/fake_rtc_event_log_factory.h index 71105558e4..0d6d076038 100644 --- a/logging/rtc_event_log/fake_rtc_event_log_factory.h +++ b/logging/rtc_event_log/fake_rtc_event_log_factory.h @@ -28,17 +28,9 @@ class FakeRtcEventLogFactory : public RtcEventLogFactoryInterface { absl::Nonnull> Create( const Environment& env) const override; - std::unique_ptr Create( - RtcEventLog::EncodingType encoding_type) const override; - - std::unique_ptr CreateRtcEventLog( - RtcEventLog::EncodingType encoding_type) override; - FakeRtcEventLog* last_log_created() { return last_log_created_; } private: - absl::Nonnull> CreateFake() const; - FakeRtcEventLog* last_log_created_ = nullptr; };