Revert of Modify PeerConnection for end-to-end QuicDataChannel usage

webrtc/api/quicdatachannel_unittest.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.
  */
 
@@ skipping 102 matching lines @@
         this, &FakeQuicDataTransport::OnIncomingStream);
   }
 
   rtc::scoped_refptr<QuicDataChannel> CreateDataChannel(
       int id,
       const std::string& label,
       const std::string& protocol) {
     DataChannelInit config;
     config.id = id;
     config.protocol = protocol;
-    rtc::scoped_refptr<QuicDataChannel> data_channel(
-        new QuicDataChannel(rtc::Thread::Current(), rtc::Thread::Current(),
-                            rtc::Thread::Current(), label, config));
+    rtc::scoped_refptr<QuicDataChannel> data_channel(new QuicDataChannel(
+        rtc::Thread::Current(), rtc::Thread::Current(), label, config));
     data_channel_by_id_[id] = data_channel;
     return data_channel;
   }
 
  private:
   void OnIncomingStream(cricket::ReliableQuicStream* stream) {
     incoming_stream_ = stream;
     incoming_stream_->SignalDataReceived.connect(
         this, &FakeQuicDataTransport::OnDataReceived);
   }
@@ skipping 59 matching lines @@
 
   rtc::scoped_refptr<QuicDataChannel> CreateDataChannelWithoutTransportChannel(
       int id,
       const std::string& label,
       const std::string& protocol) {
     return fake_quic_data_transport_.CreateDataChannel(id, label, protocol);
   }
 
   // Connects |ice_transport_channel_| to that of the other peer.
   void Connect(QuicDataChannelPeer* other_peer) {
+    ice_transport_channel_->Connect();
+    other_peer->ice_transport_channel_->Connect();
     ice_transport_channel_->SetDestination(other_peer->ice_transport_channel_);
   }
 
   std::unique_ptr<rtc::SSLFingerprint>& local_fingerprint() {
     return local_fingerprint_;
   }
 
   QuicTransportChannel* quic_transport_channel() {
     return &quic_transport_channel_;
   }
@@ skipping 434 matching lines @@
   size_t bytes_read2;
   ASSERT_TRUE(webrtc::ParseQuicDataMessageHeader(
       header2.data<char>(), header2.size(), &decoded_data_channel_id2,
       &decoded_message_id2, &bytes_read2));
   EXPECT_EQ(data_channel_id2, decoded_data_channel_id2);
   EXPECT_EQ(message_id2, decoded_message_id2);
   EXPECT_EQ(8u, bytes_read2);
 }
 
 }  // namespace