From 393a9f6926636b94ec8accd5dfe4cd6e5c8ebafe Mon Sep 17 00:00:00 2001 From: eladalon Date: Tue, 5 Sep 2017 04:30:30 -0700 Subject: [PATCH] Avoid construction of unused RtcEventLogNullImpl object This CL addresses to nits: 1. When event_log_factory_ is not null, there's no need to create a RtcEventLogNullImpl object. 2. Use MakeUnique. BUG=None Review-Url: https://codereview.webrtc.org/3012763002 Cr-Commit-Position: refs/heads/master@{#19686} --- webrtc/pc/peerconnectionfactory.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webrtc/pc/peerconnectionfactory.cc b/webrtc/pc/peerconnectionfactory.cc index be083c26b7..d4ee405f1a 100644 --- a/webrtc/pc/peerconnectionfactory.cc +++ b/webrtc/pc/peerconnectionfactory.cc @@ -21,6 +21,7 @@ #include "webrtc/logging/rtc_event_log/rtc_event_log.h" #include "webrtc/rtc_base/bind.h" #include "webrtc/rtc_base/checks.h" +#include "webrtc/rtc_base/ptr_util.h" // Adding 'nogncheck' to disable the gn include headers check to support modular // WebRTC build targets. // TODO(zhihuang): This wouldn't be necessary if the interface and @@ -260,10 +261,9 @@ PeerConnectionFactory::CreatePeerConnection( RTC_FROM_HERE, rtc::Bind(&cricket::PortAllocator::SetNetworkIgnoreMask, allocator.get(), options_.network_ignore_mask)); - std::unique_ptr event_log(new RtcEventLogNullImpl()); - if (event_log_factory_) { - event_log = event_log_factory_->CreateRtcEventLog(); - } + std::unique_ptr event_log = + event_log_factory_ ? event_log_factory_->CreateRtcEventLog() + : rtc::MakeUnique(); std::unique_ptr call = worker_thread_->Invoke>( RTC_FROM_HERE,