From abea6e5114b777f469da077344bea4e4956de49c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@webrtc.org>
Date: Fri, 8 Mar 2019 14:49:32 +0100
Subject: [PATCH] Delete always-true member is_media_transport_factory_enabled_

Member was added to JsepTransportController in
https://webrtc-review.googlesource.com/c/119911, but only code path
setting it to false was deleted in
https://webrtc-review.googlesource.com/c/125040

Bug: webrtc:9719
Change-Id: I9d2c5f338dfc30a769ed54d64e7f5bf27c230e31
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/126521
Reviewed-by: Peter Slatala <psla@webrtc.org>
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27048}
---
 pc/jsep_transport_controller.cc |  5 +----
 pc/jsep_transport_controller.h  | 10 ++++------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/pc/jsep_transport_controller.cc b/pc/jsep_transport_controller.cc
index f8821bb1ec..e92dab5925 100644
--- a/pc/jsep_transport_controller.cc
+++ b/pc/jsep_transport_controller.cc
@@ -447,7 +447,7 @@ JsepTransportController::CreateDtlsTransport(
   // If media transport is used for both media and data channels,
   // then we don't need to create DTLS.
   // Otherwise, DTLS is still created.
-  if (is_media_transport_factory_enabled_ && config_.media_transport_factory &&
+  if (config_.media_transport_factory &&
       config_.use_media_transport_for_media &&
       config_.use_media_transport_for_data_channels) {
     dtls = absl::make_unique<cricket::NoOpDtlsTransport>(
@@ -960,9 +960,6 @@ JsepTransportController::MaybeCreateMediaTransport(
     const cricket::ContentInfo& content_info,
     const cricket::SessionDescription& description,
     bool local) {
-  if (!is_media_transport_factory_enabled_) {
-    return nullptr;
-  }
   if (config_.media_transport_factory == nullptr) {
     return nullptr;
   }
diff --git a/pc/jsep_transport_controller.h b/pc/jsep_transport_controller.h
index 537b2b1d86..fff08d1889 100644
--- a/pc/jsep_transport_controller.h
+++ b/pc/jsep_transport_controller.h
@@ -89,6 +89,10 @@ class JsepTransportController : public sigslot::has_slots<> {
     // Whether media transport is used for data channels.
     bool use_media_transport_for_data_channels = false;
 
+    // Whether an RtpMediaTransport should be created as default, when no
+    // MediaTransportFactory is provided.
+    bool use_rtp_media_transport = false;
+
     // Optional media transport factory (experimental). If provided it will be
     // used to create media_transport (as long as either
     // |use_media_transport_for_media| or
@@ -379,12 +383,6 @@ class JsepTransportController : public sigslot::has_slots<> {
   cricket::IceGatheringState ice_gathering_state_ = cricket::kIceGatheringNew;
 
   Config config_;
-  // Determines if Config::media_transport_factory should be used
-  // to create a media transport. (when falling back to RTP this may be false).
-  // This is a prerequisite, but is not sufficient to create media transport
-  // (the factory needs to be provided in the config, and config must allow for
-  // media transport).
-  bool is_media_transport_factory_enabled_ = true;
 
   // Early on in the call we don't know if media transport is going to be used,
   // but we need to get the server-supported parameters to add to an SDP.