Revert of Separating SCTP code from BaseChannel/MediaChannel.

webrtc/media/BUILD.gn

 # Copyright (c) 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.
 
 import("//build/config/linux/pkg_config.gni")
 import("../build/webrtc.gni")
@@ skipping 36 matching lines @@
   libs = []
   deps = []
   sources = [
     "base/adaptedvideotracksource.cc",
     "base/adaptedvideotracksource.h",
     "base/audiosource.h",
     "base/codec.cc",
     "base/codec.h",
     "base/cryptoparams.h",
     "base/device.h",
+    "base/hybriddataengine.h",
     "base/mediachannel.h",
     "base/mediaconstants.cc",
     "base/mediaconstants.h",
     "base/mediaengine.cc",
     "base/mediaengine.h",
     "base/rtpdataengine.cc",
     "base/rtpdataengine.h",
     "base/rtpdump.cc",
     "base/rtpdump.h",
     "base/rtputils.cc",
@@ skipping 68 matching lines @@
     "engine/webrtcvideocapturerfactory.h",
     "engine/webrtcvideodecoderfactory.h",
     "engine/webrtcvideoencoderfactory.cc",
     "engine/webrtcvideoencoderfactory.h",
     "engine/webrtcvideoengine2.cc",
     "engine/webrtcvideoengine2.h",
     "engine/webrtcvideoframe.h",
     "engine/webrtcvoe.h",
     "engine/webrtcvoiceengine.cc",
     "engine/webrtcvoiceengine.h",
-    "sctp/sctptransportinternal.h",
   ]
 
   if (rtc_enable_sctp) {
     sources += [
-      "sctp/sctptransport.cc",
-      "sctp/sctptransport.h",
+      "sctp/sctpdataengine.cc",
+      "sctp/sctpdataengine.h",
     ]
   }
 
   configs += [ ":rtc_media_warnings_config" ]
 
   if (!build_with_chromium && is_clang) {
     # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
   }
 
@@ skipping 177 matching lines @@
       "engine/simulcast_unittest.cc",
       "engine/videodecodersoftwarefallbackwrapper_unittest.cc",
       "engine/videoencodersoftwarefallbackwrapper_unittest.cc",
       "engine/webrtcmediaengine_unittest.cc",
       "engine/webrtcvideocapturer_unittest.cc",
       "engine/webrtcvideoengine2_unittest.cc",
       "engine/webrtcvoiceengine_unittest.cc",
     ]
 
     if (rtc_enable_sctp) {
-      sources += [ "sctp/sctptransport_unittest.cc" ]
+      sources += [ "sctp/sctpdataengine_unittest.cc" ]
     }
 
     configs += [ ":rtc_media_unittests_config" ]
 
     if (rtc_use_h264) {
       defines += [ "WEBRTC_USE_H264" ]
     }
     if (is_win) {
       cflags = [
         "/wd4245",  # conversion from int to size_t, signed/unsigned mismatch.
@@ skipping 26 matching lines @@
       # TODO(kjellander): Move as part of work in bugs.webrtc.org/4243.
       ":rtc_media",
       ":rtc_unittest_main",
       "../audio",
       "../base:rtc_base_tests_utils",
       "../modules/audio_device:mock_audio_device",
       "../system_wrappers:metrics_default",
     ]
   }
 }