Reland of: Separating SCTP code from BaseChannel/MediaChannel.

webrtc/api/rtcstatscollector.cc

Index: webrtc/api/rtcstatscollector.cc
diff --git a/webrtc/api/rtcstatscollector.cc b/webrtc/api/rtcstatscollector.cc
index 3ab7ac94e1e12429a423d05d7180da4f84fdbef3..dc14970854f0e8ffa10894f019cedfd25d5e7448 100644
--- a/webrtc/api/rtcstatscollector.cc
+++ b/webrtc/api/rtcstatscollector.cc
@@ -463,10 +463,16 @@ void RTCStatsCollector::GetStatsReport(
           ChannelNamePair(pc_->session()->video_channel()->content_name(),
                           pc_->session()->video_channel()->transport_name()));
     }
-    if (pc_->session()->data_channel()) {
+    if (pc_->session()->rtp_data_channel()) {
+      channel_name_pairs_->data =
+          rtc::Optional<ChannelNamePair>(ChannelNamePair(
+              pc_->session()->rtp_data_channel()->content_name(),
+              pc_->session()->rtp_data_channel()->transport_name()));
+    }
+    if (pc_->session()->sctp_content_name()) {
       channel_name_pairs_->data = rtc::Optional<ChannelNamePair>(
-          ChannelNamePair(pc_->session()->data_channel()->content_name(),
-                          pc_->session()->data_channel()->transport_name()));
+          ChannelNamePair(*pc_->session()->sctp_content_name(),
+                          *pc_->session()->sctp_transport_name()));
     }
     media_info_.reset(PrepareMediaInfo_s().release());