Revert of Separating SCTP code from BaseChannel/MediaChannel.

webrtc/media/base/rtpdataengine.h

 /*
  *  Copyright (c) 2012 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.
  */
 
 #ifndef WEBRTC_MEDIA_BASE_RTPDATAENGINE_H_
 #define WEBRTC_MEDIA_BASE_RTPDATAENGINE_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "webrtc/media/base/mediachannel.h"
 #include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/media/base/mediaengine.h"
 
 namespace cricket {
 
 struct DataCodec;
 
 class RtpDataEngine : public DataEngineInterface {
  public:
   RtpDataEngine();
 
-  virtual DataMediaChannel* CreateChannel(const MediaConfig& config);
+  virtual DataMediaChannel* CreateChannel(DataChannelType data_channel_type,
+                                          const MediaConfig& config);
 
   virtual const std::vector<DataCodec>& data_codecs() {
     return data_codecs_;
   }
 
  private:
   std::vector<DataCodec> data_codecs_;
 };
 
 // Keep track of sequence number and timestamp of an RTP stream.  The
@@ skipping 61 matching lines @@
   std::vector<DataCodec> recv_codecs_;
   std::vector<StreamParams> send_streams_;
   std::vector<StreamParams> recv_streams_;
   std::map<uint32_t, RtpClock*> rtp_clock_by_send_ssrc_;
   std::unique_ptr<rtc::RateLimiter> send_limiter_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_BASE_RTPDATAENGINE_H_