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

net/tools/quic/quic_spdy_client_stream_test.cc

Index: net/tools/quic/quic_spdy_client_stream_test.cc
diff --git a/net/tools/quic/quic_spdy_client_stream_test.cc b/net/tools/quic/quic_spdy_client_stream_test.cc
index 16e4fdfc676010a05dd1e1ffd31b230343e4912a..aaed5a7bad8ebcab1499305d233747f5814c1489 100644
--- a/net/tools/quic/quic_spdy_client_stream_test.cc
+++ b/net/tools/quic/quic_spdy_client_stream_test.cc
@@ -14,7 +14,6 @@
 #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"
 
@@ -64,9 +63,7 @@
     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());
   }
@@ -158,9 +155,7 @@
   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);