Remove functions to inject a TaskQueue in RtcEventLog creation.
The event log implementation will be simpler if it creates its own TaskQueue.
If we really need the "injectable" functionality, it could be achieved via a
TaskQueueFactory that returns a move-constructible TaskQueue.
Bug: webrtc:10085
Change-Id: I538be3dd77c09be2f5bae015227067acd6af8355
Reviewed-on: https://webrtc-review.googlesource.com/c/113140
Reviewed-by: Elad Alon <eladalon@webrtc.org>
Commit-Queue: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25908}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 5f8dab0..852a3c8 100644
--- a/logging/rtc_event_log/fake_rtc_event_log_factory.cc
+++ b/logging/rtc_event_log/fake_rtc_event_log_factory.cc
@@ -22,12 +22,4 @@
return fake_event_log;
}
-std::unique_ptr<RtcEventLog> FakeRtcEventLogFactory::CreateRtcEventLog(
- RtcEventLog::EncodingType encoding_type,
- std::unique_ptr<rtc::TaskQueue> task_queue) {
- std::unique_ptr<RtcEventLog> fake_event_log(new FakeRtcEventLog(thread()));
- last_log_created_ = fake_event_log.get();
- return fake_event_log;
-}
-
} // 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 1160e54..dad6664 100644
--- a/logging/rtc_event_log/fake_rtc_event_log_factory.h
+++ b/logging/rtc_event_log/fake_rtc_event_log_factory.h
@@ -27,10 +27,6 @@
std::unique_ptr<RtcEventLog> CreateRtcEventLog(
RtcEventLog::EncodingType encoding_type) override;
- std::unique_ptr<RtcEventLog> CreateRtcEventLog(
- RtcEventLog::EncodingType encoding_type,
- std::unique_ptr<rtc::TaskQueue> task_queue) override;
-
webrtc::RtcEventLog* last_log_created() { return last_log_created_; }
rtc::Thread* thread() { return thread_; }
diff --git a/logging/rtc_event_log/rtc_event_log.h b/logging/rtc_event_log/rtc_event_log.h
index 7d900c0..8384230 100644
--- a/logging/rtc_event_log/rtc_event_log.h
+++ b/logging/rtc_event_log/rtc_event_log.h
@@ -37,12 +37,6 @@
// Factory method to create an RtcEventLog object.
static std::unique_ptr<RtcEventLog> Create(EncodingType encoding_type);
- // Factory method to create an RtcEventLog object which uses the given
- // rtc::TaskQueue for emitting output.
- static std::unique_ptr<RtcEventLog> Create(
- EncodingType encoding_type,
- std::unique_ptr<rtc::TaskQueue> task_queue);
-
// Create an RtcEventLog object that does nothing.
static std::unique_ptr<RtcEventLog> CreateNull();
diff --git a/logging/rtc_event_log/rtc_event_log_factory.cc b/logging/rtc_event_log/rtc_event_log_factory.cc
index e9d983d..a116973 100644
--- a/logging/rtc_event_log/rtc_event_log_factory.cc
+++ b/logging/rtc_event_log/rtc_event_log_factory.cc
@@ -21,12 +21,6 @@
return RtcEventLog::Create(encoding_type);
}
-std::unique_ptr<RtcEventLog> RtcEventLogFactory::CreateRtcEventLog(
- RtcEventLog::EncodingType encoding_type,
- std::unique_ptr<rtc::TaskQueue> task_queue) {
- return RtcEventLog::Create(encoding_type, std::move(task_queue));
-}
-
std::unique_ptr<RtcEventLogFactoryInterface> CreateRtcEventLogFactory() {
return std::unique_ptr<RtcEventLogFactoryInterface>(new RtcEventLogFactory());
}
diff --git a/logging/rtc_event_log/rtc_event_log_factory.h b/logging/rtc_event_log/rtc_event_log_factory.h
index 2253379..713084f 100644
--- a/logging/rtc_event_log/rtc_event_log_factory.h
+++ b/logging/rtc_event_log/rtc_event_log_factory.h
@@ -25,10 +25,6 @@
std::unique_ptr<RtcEventLog> CreateRtcEventLog(
RtcEventLog::EncodingType encoding_type) override;
-
- std::unique_ptr<RtcEventLog> CreateRtcEventLog(
- RtcEventLog::EncodingType encoding_type,
- std::unique_ptr<rtc::TaskQueue> task_queue) override;
};
std::unique_ptr<RtcEventLogFactoryInterface> CreateRtcEventLogFactory();
diff --git a/logging/rtc_event_log/rtc_event_log_factory_interface.h b/logging/rtc_event_log/rtc_event_log_factory_interface.h
index 395f2dc..7aaed75 100644
--- a/logging/rtc_event_log/rtc_event_log_factory_interface.h
+++ b/logging/rtc_event_log/rtc_event_log_factory_interface.h
@@ -27,10 +27,6 @@
virtual std::unique_ptr<RtcEventLog> CreateRtcEventLog(
RtcEventLog::EncodingType encoding_type) = 0;
-
- virtual std::unique_ptr<RtcEventLog> CreateRtcEventLog(
- RtcEventLog::EncodingType encoding_type,
- std::unique_ptr<rtc::TaskQueue> task_queue) = 0;
};
std::unique_ptr<RtcEventLogFactoryInterface> CreateRtcEventLogFactory();
diff --git a/logging/rtc_event_log/rtc_event_log_impl.cc b/logging/rtc_event_log/rtc_event_log_impl.cc
index b224b70..9a64788 100644
--- a/logging/rtc_event_log/rtc_event_log_impl.cc
+++ b/logging/rtc_event_log/rtc_event_log_impl.cc
@@ -369,16 +369,10 @@
// RtcEventLog member functions.
std::unique_ptr<RtcEventLog> RtcEventLog::Create(EncodingType encoding_type) {
- return Create(encoding_type,
- absl::make_unique<rtc::TaskQueue>("rtc_event_log"));
-}
-
-std::unique_ptr<RtcEventLog> RtcEventLog::Create(
- EncodingType encoding_type,
- std::unique_ptr<rtc::TaskQueue> task_queue) {
#ifdef ENABLE_RTC_EVENT_LOG
- return absl::make_unique<RtcEventLogImpl>(CreateEncoder(encoding_type),
- std::move(task_queue));
+ return absl::make_unique<RtcEventLogImpl>(
+ CreateEncoder(encoding_type),
+ absl::make_unique<rtc::TaskQueue>("rtc_event_log"));
#else
return CreateNull();
#endif // ENABLE_RTC_EVENT_LOG
