Revert of Modify PeerConnection 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/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)
-    : signaling_thread_(signaling_thread),
-      worker_thread_(worker_thread),
-      network_thread_(network_thread) {
+                                     rtc::Thread* worker_thread)
+    : signaling_thread_(signaling_thread), worker_thread_(worker_thread) {
   RTC_DCHECK(signaling_thread_);
   RTC_DCHECK(worker_thread_);
-  RTC_DCHECK(network_thread_);
 }
 
 QuicDataTransport::~QuicDataTransport() {}
 
 bool QuicDataTransport::SetTransportChannel(
     cricket::QuicTransportChannel* channel) {
   if (!channel) {
     LOG(LS_ERROR) << "|channel| is NULL. Cannot set transport channel.";
     return false;
   }
@@ skipping 27 matching lines @@
 rtc::scoped_refptr<DataChannelInterface> QuicDataTransport::CreateDataChannel(
     const std::string& label,
     const DataChannelInit* config) {
   if (config == nullptr) {
     return nullptr;
   }
   if (data_channel_by_id_.find(config->id) != data_channel_by_id_.end()) {
     LOG(LS_ERROR) << "QUIC data channel already exists with id " << config->id;
     return nullptr;
   }
-  rtc::scoped_refptr<QuicDataChannel> data_channel(new QuicDataChannel(
-      signaling_thread_, worker_thread_, network_thread_, label, *config));
+  rtc::scoped_refptr<QuicDataChannel> data_channel(
+      new QuicDataChannel(signaling_thread_, worker_thread_, label, *config));
   if (quic_transport_channel_) {
     if (!data_channel->SetTransportChannel(quic_transport_channel_)) {
       LOG(LS_ERROR)
           << "Cannot set QUIC transport channel for QUIC data channel "
           << config->id;
     }
   }
 
   data_channel_by_id_[data_channel->id()] = data_channel;
   return data_channel;
@@ skipping 54 matching lines @@
   }
   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));
 }
 
 }  // namespace webrtc