From 89e712649d417c5371ff80ec63357dff8ae9ab6a Mon Sep 17 00:00:00 2001 From: Oskar Sundbom Date: Thu, 16 Nov 2017 10:56:31 +0100 Subject: [PATCH] Optional: Use nullopt and implicit construction in /pc/rtcstatscollector.cc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes places where we explicitly construct an Optional to instead use nullopt or the requisite value type only. This CL was uploaded by git cl split. R=hbos@webrtc.org Bug: None Change-Id: I435258d0b16660bcc58c236158c19507ef60f57b Reviewed-on: https://webrtc-review.googlesource.com/23609 Reviewed-by: Henrik Boström Commit-Queue: Oskar Sundbom Cr-Commit-Position: refs/heads/master@{#20817} --- pc/rtcstatscollector.cc | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pc/rtcstatscollector.cc b/pc/rtcstatscollector.cc index 12a6f5a780..8353cd77db 100644 --- a/pc/rtcstatscollector.cc +++ b/pc/rtcstatscollector.cc @@ -639,24 +639,23 @@ void RTCStatsCollector::GetStatsReport( // |ProducePartialResultsOnNetworkThread|. channel_name_pairs_.reset(new ChannelNamePairs()); if (pc_->voice_channel()) { - channel_name_pairs_->voice = rtc::Optional( + channel_name_pairs_->voice = ChannelNamePair(pc_->voice_channel()->content_name(), - pc_->voice_channel()->transport_name())); + pc_->voice_channel()->transport_name()); } if (pc_->video_channel()) { - channel_name_pairs_->video = rtc::Optional( + channel_name_pairs_->video = ChannelNamePair(pc_->video_channel()->content_name(), - pc_->video_channel()->transport_name())); + pc_->video_channel()->transport_name()); } if (pc_->rtp_data_channel()) { - channel_name_pairs_->data = rtc::Optional( + channel_name_pairs_->data = ChannelNamePair(pc_->rtp_data_channel()->content_name(), - pc_->rtp_data_channel()->transport_name())); + pc_->rtp_data_channel()->transport_name()); } if (pc_->sctp_content_name()) { - channel_name_pairs_->data = - rtc::Optional(ChannelNamePair( - *pc_->sctp_content_name(), *pc_->sctp_transport_name())); + channel_name_pairs_->data = ChannelNamePair(*pc_->sctp_content_name(), + *pc_->sctp_transport_name()); } // Prepare |track_media_info_map_| for use in // |ProducePartialResultsOnNetworkThread| and