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

webrtc/p2p/quic/reliablequicstream_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 31 matching lines @@
 using net::QuicSession;
 using net::QuicStreamId;
 using net::QuicStreamOffset;
 using net::SpdyPriority;
 
 using rtc::SR_SUCCESS;
 using rtc::SR_BLOCK;
 
 // Arbitrary number for a stream's write blocked priority.
 static const SpdyPriority kDefaultPriority = 3;
-static const net::QuicStreamId kStreamId = 5;
 
 // QuicSession that does not create streams and writes data from
 // ReliableQuicStream to a string.
 class MockQuicSession : public QuicSession {
  public:
   MockQuicSession(QuicConnection* connection,
                   const QuicConfig& config,
                   std::string* write_buffer)
       : QuicSession(connection, config), write_buffer_(write_buffer) {}
 
   // Writes outgoing data from ReliableQuicStream to a string.
   QuicConsumedData WritevData(
       QuicStreamId id,
       QuicIOVector iovector,
       QuicStreamOffset offset,
       bool fin,
       QuicAckListenerInterface* ack_notifier_delegate) override {
     if (!writable_) {
       return QuicConsumedData(0, false);
     }
 
     const char* data = reinterpret_cast<const char*>(iovector.iov->iov_base);
     size_t len = iovector.total_length;
     write_buffer_->append(data, len);
     return QuicConsumedData(len, false);
   }
 
   net::ReliableQuicStream* CreateIncomingDynamicStream(
       QuicStreamId id) override {
-    return new ReliableQuicStream(kStreamId, this);
+    return nullptr;
   }
 
   net::ReliableQuicStream* CreateOutgoingDynamicStream(
       SpdyPriority priority) override {
     return nullptr;
   }
 
   QuicCryptoStream* GetCryptoStream() override { return nullptr; }
 
   // Called by ReliableQuicStream when they want to close stream.
@@ skipping 43 matching lines @@
     return 0;
   }
 };
 
 class ReliableQuicStreamTest : public ::testing::Test,
                                public sigslot::has_slots<> {
  public:
   ReliableQuicStreamTest() {}
 
   void CreateReliableQuicStream() {
+    const net::QuicStreamId kStreamId = 5;
 
     // Arbitrary values for QuicConnection.
     QuicConnectionHelper* quic_helper =
         new QuicConnectionHelper(rtc::Thread::Current());
     Perspective perspective = Perspective::IS_SERVER;
     net::IPAddress ip(0, 0, 0, 0);
 
     bool owns_writer = true;
 
     QuicConnection* connection = new QuicConnection(
@@ skipping 69 matching lines @@
   EXPECT_FALSE(stream_->HasBufferedData());
   EXPECT_EQ("Foo bar", write_buffer_);
 
   EXPECT_EQ(SR_SUCCESS, stream_->Write("xyzzy", 5));
   EXPECT_EQ("Foo barxyzzy", write_buffer_);
 }
 
 // Read an entire string.
 TEST_F(ReliableQuicStreamTest, ReadDataWhole) {
   CreateReliableQuicStream();
-  net::QuicStreamFrame frame(kStreamId, false, 0, "Hello, World!");
+  net::QuicStreamFrame frame(-1, false, 0, "Hello, World!");
   stream_->OnStreamFrame(frame);
 
   EXPECT_EQ("Hello, World!", read_buffer_);
 }
 
 // Read part of a string.
 TEST_F(ReliableQuicStreamTest, ReadDataPartial) {
   CreateReliableQuicStream();
-  net::QuicStreamFrame frame(kStreamId, false, 0, "Hello, World!");
+  net::QuicStreamFrame frame(-1, false, 0, "Hello, World!");
   frame.frame_length = 5;
   stream_->OnStreamFrame(frame);
 
   EXPECT_EQ("Hello", read_buffer_);
 }
 
 // Test that closing the stream results in a callback.
 TEST_F(ReliableQuicStreamTest, CloseStream) {
   CreateReliableQuicStream();
   EXPECT_FALSE(closed_);
   stream_->OnClose();
   EXPECT_TRUE(closed_);
 }