From 0a6a2b73a1c5f1cf63efeaea095aa2669071e0b4 Mon Sep 17 00:00:00 2001 From: Bjorn Terelius Date: Fri, 19 Jan 2018 17:52:38 +0100 Subject: [PATCH] Remove dependency on system_wrappers from rtc_event_log. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:8111 Change-Id: Id9e2503b153bc7172e7a5e92f6becc791da0aadf Reviewed-on: https://webrtc-review.googlesource.com/41261 Commit-Queue: Björn Terelius Reviewed-by: Åsa Persson Reviewed-by: Ilya Nikolaevskiy Cr-Commit-Position: refs/heads/master@{#21698} --- logging/BUILD.gn | 4 ---- logging/rtc_event_log/DEPS | 1 - logging/rtc_event_log/rtc_event_log.h | 9 --------- video/video_quality_test.cc | 6 ++---- 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/logging/BUILD.gn b/logging/BUILD.gn index f1afddccd5..33290d30ac 100644 --- a/logging/BUILD.gn +++ b/logging/BUILD.gn @@ -79,7 +79,6 @@ rtc_source_set("rtc_event_log_api") { "../modules/rtp_rtcp:rtp_rtcp_format", "../rtc_base:checks", "../rtc_base:rtc_base_approved", - "../system_wrappers", ] # TODO(eladalon): Remove this. @@ -113,7 +112,6 @@ rtc_static_library("rtc_event_log_impl") { "../rtc_base:rtc_base_approved", "../rtc_base:rtc_task_queue", "../rtc_base:sequenced_task_checker", - "../system_wrappers", ] if (rtc_enable_protobuf) { @@ -162,7 +160,6 @@ if (rtc_enable_protobuf) { "../rtc_base:checks", "../rtc_base:protobuf_utils", "../rtc_base:rtc_base_approved", - "../system_wrappers", ] if (!build_with_chromium && is_clang) { @@ -200,7 +197,6 @@ if (rtc_enable_protobuf) { "../rtc_base:checks", "../rtc_base:rtc_base_approved", "../rtc_base:rtc_base_tests_utils", - "../system_wrappers:metrics_default", "../test:test_support", "//testing/gmock", "//testing/gtest", diff --git a/logging/rtc_event_log/DEPS b/logging/rtc_event_log/DEPS index ec93428e80..d09e30eace 100644 --- a/logging/rtc_event_log/DEPS +++ b/logging/rtc_event_log/DEPS @@ -3,5 +3,4 @@ include_rules = [ "+modules/audio_coding/audio_network_adaptor", "+modules/remote_bitrate_estimator/include", "+modules/rtp_rtcp", - "+system_wrappers", ] diff --git a/logging/rtc_event_log/rtc_event_log.h b/logging/rtc_event_log/rtc_event_log.h index 89b4fc1a08..3a52480891 100644 --- a/logging/rtc_event_log/rtc_event_log.h +++ b/logging/rtc_event_log/rtc_event_log.h @@ -20,8 +20,6 @@ namespace webrtc { -class Clock; - enum PacketDirection { kIncomingPacket = 0, kOutgoingPacket }; class RtcEventLog { @@ -38,13 +36,6 @@ class RtcEventLog { // Factory method to create an RtcEventLog object. static std::unique_ptr Create(EncodingType encoding_type); - // TODO(nisse): webrtc::Clock is deprecated. Delete this method and - // above forward declaration of Clock when - // webrtc/system_wrappers/include/clock.h is deleted. - static std::unique_ptr Create(const Clock* clock, - EncodingType encoding_type) { - return Create(encoding_type); - } // Create an RtcEventLog object that does nothing. static std::unique_ptr CreateNull(); diff --git a/video/video_quality_test.cc b/video/video_quality_test.cc index 234f4d1d3e..5a204715ca 100644 --- a/video/video_quality_test.cc +++ b/video/video_quality_test.cc @@ -1834,10 +1834,8 @@ void VideoQualityTest::RunWithAnalyzer(const Params& params) { } if (!params.logging.rtc_event_log_name.empty()) { - send_event_log_ = - RtcEventLog::Create(clock_, RtcEventLog::EncodingType::Legacy); - recv_event_log_ = - RtcEventLog::Create(clock_, RtcEventLog::EncodingType::Legacy); + send_event_log_ = RtcEventLog::Create(RtcEventLog::EncodingType::Legacy); + recv_event_log_ = RtcEventLog::Create(RtcEventLog::EncodingType::Legacy); std::unique_ptr send_output( rtc::MakeUnique( params.logging.rtc_event_log_name + "_send",