commit 89e712649d417c5371ff80ec63357dff8ae9ab6a
author Oskar Sundbom <ossu@webrtc.org> Thu Nov 16 09:56:31 2017
committer Commit Bot <commit-bot@chromium.org> Tue Nov 21 15:04:17 2017
tree 154fc3f374b6b3a7de21aa7dfaf945f130bde66d
parent 7880758b90a7ff43e52f886704876355a63f11b4

Optional: Use nullopt and implicit construction in /pc/rtcstatscollector.cc

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 <hbos@webrtc.org>
Commit-Queue: Oskar Sundbom <ossu@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20817}

pc/rtcstatscollector.cc

diff --git a/pc/rtcstatscollector.cc b/pc/rtcstatscollector.cc
index 12a6f5a..8353cd7 100644
--- a/pc/rtcstatscollector.cc
+++ b/pc/rtcstatscollector.cc
@@ -639,24 +639,23 @@
     // |ProducePartialResultsOnNetworkThread|.
     channel_name_pairs_.reset(new ChannelNamePairs());
     if (pc_->voice_channel()) {
-      channel_name_pairs_->voice = rtc::Optional<ChannelNamePair>(
+      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<ChannelNamePair>(
+      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<ChannelNamePair>(
+      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>(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