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

webrtc/api/quicdatatransport_unittest.cc

Index: webrtc/api/quicdatatransport_unittest.cc
diff --git a/webrtc/api/quicdatatransport_unittest.cc b/webrtc/api/quicdatatransport_unittest.cc
index 975898ef1f886f7cb93f95fc45c673d660accb61..90f5d5fb4262d68b5bb02cced1e841369abb5d60 100644
--- a/webrtc/api/quicdatatransport_unittest.cc
+++ b/webrtc/api/quicdatatransport_unittest.cc
@@ -30,6 +30,7 @@ using webrtc::DataChannelObserver;
 using webrtc::QuicDataChannel;
 using webrtc::QuicDataTransport;
 using cricket::FakeTransportChannel;
+using cricket::FakeTransportController;
 using cricket::QuicTransportChannel;
 using cricket::ReliableQuicStream;
 
@@ -66,7 +67,8 @@ class QuicDataTransportPeer {
   QuicDataTransportPeer()
       : quic_data_transport_(rtc::Thread::Current(),
                              rtc::Thread::Current(),
-                             rtc::Thread::Current()),
+                             rtc::Thread::Current(),
+                             new FakeTransportController()),
         ice_transport_channel_(new FakeTransportChannel("data", 0)),
         quic_transport_channel_(ice_transport_channel_) {
     ice_transport_channel_->SetAsync(true);
@@ -340,7 +342,7 @@ TEST_F(QuicDataTransportTest, EndToEndSendReceiveMessages) {
 }
 
 // Tests that SetTransportChannel returns false when setting a NULL transport
-// channel or a transport channel that is not equivalent to the one already set.
+// channel.
 TEST_F(QuicDataTransportTest, SetTransportChannelReturnValue) {
   QuicDataTransport* quic_data_transport = peer1_.quic_data_transport();
   EXPECT_FALSE(quic_data_transport->SetTransportChannel(nullptr));
@@ -349,7 +351,7 @@ TEST_F(QuicDataTransportTest, SetTransportChannelReturnValue) {
   EXPECT_TRUE(quic_data_transport->SetTransportChannel(transport_channel));
   QuicTransportChannel* other_transport_channel =
       peer2_.quic_transport_channel();
-  EXPECT_FALSE(
+  EXPECT_TRUE(
       quic_data_transport->SetTransportChannel(other_transport_channel));
 }