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 cf97057c1b6884595618b3083beeacad5727f93d..9d3193d76e89a5857ab2804c0e0296ad76a30770 100644
--- a/webrtc/api/rtcstatscollector.cc
+++ b/webrtc/api/rtcstatscollector.cc
@@ -450,10 +450,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().empty()) {
       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());
     invoker_.AsyncInvoke<void>(RTC_FROM_HERE, network_thread_,