Reland of: Separating SCTP code from BaseChannel/MediaChannel.

webrtc/api/rtcstatscollector.cc

 /*
  *  Copyright 2016 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 432 matching lines @@
     if (pc_->session()->voice_channel()) {
       channel_name_pairs_->voice = rtc::Optional<ChannelNamePair>(
           ChannelNamePair(pc_->session()->voice_channel()->content_name(),
                           pc_->session()->voice_channel()->transport_name()));
     }
     if (pc_->session()->video_channel()) {
       channel_name_pairs_->video = rtc::Optional<ChannelNamePair>(
           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_,
         rtc::Bind(&RTCStatsCollector::ProducePartialResultsOnNetworkThread,
             rtc::scoped_refptr<RTCStatsCollector>(this), timestamp_us));
   }
 }
 
 void RTCStatsCollector::ClearCachedStatsReport() {
   RTC_DCHECK(signaling_thread_->IsCurrent());
@@ skipping 498 matching lines @@
     const std::string& type) {
   return CandidateTypeToRTCIceCandidateType(type);
 }
 
 const char* DataStateToRTCDataChannelStateForTesting(
     DataChannelInterface::DataState state) {
   return DataStateToRTCDataChannelState(state);
 }
 
 }  // namespace webrtc