Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(647)

Unified Diff: webrtc/pc/peerconnectionfactory.cc

Issue 3012763002: Avoid construction of unused RtcEventLogNullImpl object (Closed)
Patch Set: Created 3 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/pc/peerconnectionfactory.cc
diff --git a/webrtc/pc/peerconnectionfactory.cc b/webrtc/pc/peerconnectionfactory.cc
index be083c26b79cd60110c29e2df36879234a4055ee..d4ee405f1a3e55d0c9d6205510b4e831e94c9cea 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<RtcEventLog> event_log(new RtcEventLogNullImpl());
- if (event_log_factory_) {
- event_log = event_log_factory_->CreateRtcEventLog();
- }
+ std::unique_ptr<RtcEventLog> event_log =
+ event_log_factory_ ? event_log_factory_->CreateRtcEventLog()
+ : rtc::MakeUnique<RtcEventLogNullImpl>();
std::unique_ptr<Call> call = worker_thread_->Invoke<std::unique_ptr<Call>>(
RTC_FROM_HERE,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698