Revert of Landing Recent QUIC changes until Sat Apr 29 00:22:04 2017 +0000

net/tools/quic/quic_spdy_client_stream_test.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/tools/quic/quic_spdy_client_stream.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "net/quic/core/quic_utils.h"
 #include "net/quic/core/spdy_utils.h"
 #include "net/quic/platform/api/quic_logging.h"
 #include "net/quic/platform/api/quic_socket_address.h"
 #include "net/quic/platform/api/quic_test.h"
 #include "net/quic/platform/api/quic_text_utils.h"
 #include "net/quic/test_tools/crypto_test_utils.h"
-#include "net/quic/test_tools/quic_spdy_session_peer.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "net/tools/quic/quic_client_session.h"
 
 using base::IntToString;
 using std::string;
 using testing::StrictMock;
 using testing::TestWithParam;
 
 namespace net {
 namespace test {
@@ skipping 29 matching lines @@
       : connection_(new StrictMock<MockQuicConnection>(&helper_,
                                                        &alarm_factory_,
                                                        Perspective::IS_CLIENT)),
         session_(connection_, &push_promise_index_),
         body_("hello world") {
     session_.Initialize();
 
     headers_[":status"] = "200";
     headers_["content-length"] = "11";
 
-    stream_.reset(new QuicSpdyClientStream(
-        QuicSpdySessionPeer::GetNthClientInitiatedStreamId(session_, 0),
-        &session_));
+    stream_.reset(new QuicSpdyClientStream(kClientDataStreamId1, &session_));
     stream_visitor_.reset(new StreamVisitor());
     stream_->set_visitor(stream_visitor_.get());
   }
 
   class StreamVisitor : public QuicSpdyClientStream::Visitor {
     void OnClose(QuicSpdyStream* stream) override {
       QUIC_DVLOG(1) << "stream " << stream->id();
     }
   };
 
@@ skipping 71 matching lines @@
   stream_->OnStreamFrame(
       QuicStreamFrame(stream_->id(), /*fin=*/false, /*offset=*/0, large_body));
 
   EXPECT_NE(QUIC_STREAM_NO_ERROR, stream_->stream_error());
 }
 
 TEST_F(QuicSpdyClientStreamTest, TestNoBidirectionalStreaming) {
   if (FLAGS_quic_reloadable_flag_quic_always_enable_bidi_streaming) {
     return;
   }
-  QuicStreamFrame frame(
-      QuicSpdySessionPeer::GetNthClientInitiatedStreamId(session_, 0), false, 3,
-      QuicStringPiece("asd"));
+  QuicStreamFrame frame(kClientDataStreamId1, false, 3, QuicStringPiece("asd"));
 
   EXPECT_FALSE(stream_->write_side_closed());
   stream_->OnStreamFrame(frame);
   EXPECT_TRUE(stream_->write_side_closed());
 }
 
 TEST_F(QuicSpdyClientStreamTest, ReceivingTrailers) {
   // Test that receiving trailing headers, containing a final offset, results in
   // the stream being closed at that byte offset.
   // Send headers as usual.
@@ skipping 20 matching lines @@
   stream_->OnStreamFrame(
       QuicStreamFrame(stream_->id(), /*fin=*/false, /*offset=*/0, body_));
   if (FLAGS_quic_reloadable_flag_quic_always_enable_bidi_streaming) {
     EXPECT_TRUE(stream_->reading_stopped());
   }
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net