Revert of Separating SCTP code from BaseChannel/MediaChannel.

webrtc/pc/channelmanager.h

Index: webrtc/pc/channelmanager.h
diff --git a/webrtc/pc/channelmanager.h b/webrtc/pc/channelmanager.h
index 3022eca8aa36cf4d0d5b3b28c5d9bf1b482fc063..7df49bb07de2354656797e52ec3d4de5cec8b8cb 100644
--- a/webrtc/pc/channelmanager.h
+++ b/webrtc/pc/channelmanager.h
@@ -110,15 +110,16 @@ class ChannelManager {
       const VideoOptions& options);
   // Destroys a video channel created with the Create API.
   void DestroyVideoChannel(VideoChannel* video_channel);
-  RtpDataChannel* CreateRtpDataChannel(
+  DataChannel* CreateDataChannel(
       webrtc::MediaControllerInterface* media_controller,
       TransportController* transport_controller,
       const std::string& content_name,
       const std::string* bundle_transport_name,
       bool rtcp,
-      bool srtp_required);
+      bool srtp_required,
+      DataChannelType data_channel_type);
   // Destroys a data channel created with the Create API.
-  void DestroyRtpDataChannel(RtpDataChannel* data_channel);
+  void DestroyDataChannel(DataChannel* data_channel);
 
   // Indicates whether any channels exist.
   bool has_channels() const {
@@ -149,7 +150,7 @@ class ChannelManager {
  private:
   typedef std::vector<VoiceChannel*> VoiceChannels;
   typedef std::vector<VideoChannel*> VideoChannels;
-  typedef std::vector<RtpDataChannel*> RtpDataChannels;
+  typedef std::vector<DataChannel*> DataChannels;
 
   void Construct(MediaEngineInterface* me,
                  DataEngineInterface* dme,
@@ -177,14 +178,15 @@ class ChannelManager {
       bool srtp_required,
       const VideoOptions& options);
   void DestroyVideoChannel_w(VideoChannel* video_channel);
-  RtpDataChannel* CreateRtpDataChannel_w(
+  DataChannel* CreateDataChannel_w(
       webrtc::MediaControllerInterface* media_controller,
       TransportController* transport_controller,
       const std::string& content_name,
       const std::string* bundle_transport_name,
       bool rtcp,
-      bool srtp_required);
-  void DestroyRtpDataChannel_w(RtpDataChannel* data_channel);
+      bool srtp_required,
+      DataChannelType data_channel_type);
+  void DestroyDataChannel_w(DataChannel* data_channel);
 
   std::unique_ptr<MediaEngineInterface> media_engine_;
   std::unique_ptr<DataEngineInterface> data_media_engine_;
@@ -195,7 +197,7 @@ class ChannelManager {
 
   VoiceChannels voice_channels_;
   VideoChannels video_channels_;
-  RtpDataChannels data_channels_;
+  DataChannels data_channels_;
 
   bool enable_rtx_;
   rtc::CryptoOptions crypto_options_;