Revert of Modified PeerConnection and WebRtcSession for end-to-end QuicDataChannel usage.

webrtc/api/quicdatatransport.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.
  */
 
 #include "webrtc/api/quicdatatransport.h"
 
-#include "webrtc/base/bind.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/p2p/quic/quictransportchannel.h"
 #include "webrtc/p2p/quic/reliablequicstream.h"
 
 namespace webrtc {
 
-QuicDataTransport::QuicDataTransport(
-    rtc::Thread* signaling_thread,
-    rtc::Thread* worker_thread,
-    rtc::Thread* network_thread,
-    cricket::TransportController* transport_controller)
+QuicDataTransport::QuicDataTransport(rtc::Thread* signaling_thread,
+                                     rtc::Thread* worker_thread,
+                                     rtc::Thread* network_thread)
     : signaling_thread_(signaling_thread),
       worker_thread_(worker_thread),
-      network_thread_(network_thread),
-      transport_controller_(transport_controller) {
+      network_thread_(network_thread) {
   RTC_DCHECK(signaling_thread_);
   RTC_DCHECK(worker_thread_);
   RTC_DCHECK(network_thread_);
 }
 
-QuicDataTransport::~QuicDataTransport() {
-  DestroyTransportChannel(quic_transport_channel_);
-  LOG(LS_INFO) << "Destroyed the QUIC data transport.";
-}
-
-bool QuicDataTransport::SetTransport(const std::string& transport_name) {
-  if (transport_name_ == transport_name) {
-    // Nothing to do if transport name isn't changing
-    return true;
-  }
-
-  cricket::QuicTransportChannel* transport_channel =
-      CreateTransportChannel(transport_name);
-  if (!SetTransportChannel(transport_channel)) {
-    DestroyTransportChannel(transport_channel);
-    return false;
-  }
-
-  transport_name_ = transport_name;
-  return true;
-}
+QuicDataTransport::~QuicDataTransport() {}
 
 bool QuicDataTransport::SetTransportChannel(
     cricket::QuicTransportChannel* channel) {
   if (!channel) {
     LOG(LS_ERROR) << "|channel| is NULL. Cannot set transport channel.";
     return false;
   }
   if (quic_transport_channel_) {
     if (channel == quic_transport_channel_) {
       LOG(LS_WARNING) << "Ignoring duplicate transport channel.";
       return true;
     }
     LOG(LS_ERROR) << "|channel| does not match existing transport channel.";
     return false;
   }
 
   LOG(LS_INFO) << "Setting QuicTransportChannel for QuicDataTransport";
   quic_transport_channel_ = channel;
   quic_transport_channel_->SignalIncomingStream.connect(
       this, &QuicDataTransport::OnIncomingStream);
+
   bool success = true;
   for (const auto& kv : data_channel_by_id_) {
     rtc::scoped_refptr<QuicDataChannel> data_channel = kv.second;
     if (!data_channel->SetTransportChannel(quic_transport_channel_)) {
       LOG(LS_ERROR)
           << "Cannot set QUIC transport channel for QUIC data channel "
           << kv.first;
       success = false;
     }
   }
@@ skipping 78 matching lines @@
     return;
   }
   QuicDataChannel* data_channel = data_channel_kv->second;
   QuicDataChannel::Message message;
   message.id = message_id;
   message.buffer = rtc::CopyOnWriteBuffer(data, len);
   message.stream = stream;
   data_channel->OnIncomingMessage(std::move(message));
 }
 
-cricket::QuicTransportChannel* QuicDataTransport::CreateTransportChannel(
-    const std::string& transport_name) {
-  DCHECK(transport_controller_->quic());
-
-  cricket::TransportChannel* transport_channel =
-      network_thread_->Invoke<cricket::TransportChannel*>(
-          RTC_FROM_HERE,
-          rtc::Bind(&cricket::TransportController::CreateTransportChannel_n,
-                    transport_controller_, transport_name,
-                    cricket::ICE_CANDIDATE_COMPONENT_DEFAULT));
-  return static_cast<cricket::QuicTransportChannel*>(transport_channel);
-}
-
-void QuicDataTransport::DestroyTransportChannel(
-    cricket::TransportChannel* transport_channel) {
-  if (transport_channel) {
-    network_thread_->Invoke<void>(
-        RTC_FROM_HERE,
-        rtc::Bind(&cricket::TransportController::DestroyTransportChannel_n,
-                  transport_controller_, transport_channel->transport_name(),
-                  cricket::ICE_CANDIDATE_COMPONENT_DEFAULT));
-  }
-}
-
 }  // namespace webrtc