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

net/tools/quic/quic_spdy_server_stream_base_test.cc

Index: net/tools/quic/quic_spdy_server_stream_base_test.cc
diff --git a/net/tools/quic/quic_spdy_server_stream_base_test.cc b/net/tools/quic/quic_spdy_server_stream_base_test.cc
index 0955fbe5efe7be642a0fd6c9b9893bcf1679cf35..a808691e8a3b8c456b28d04ab235a8bd0e859b48 100644
--- a/net/tools/quic/quic_spdy_server_stream_base_test.cc
+++ b/net/tools/quic/quic_spdy_server_stream_base_test.cc
@@ -6,7 +6,6 @@
 
 #include "net/quic/platform/api/quic_ptr_util.h"
 #include "net/quic/platform/api/quic_test.h"
-#include "net/quic/test_tools/quic_spdy_session_peer.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 
 using testing::_;
@@ -29,9 +28,7 @@
       : session_(new MockQuicConnection(&helper_,
                                         &alarm_factory_,
                                         Perspective::IS_SERVER)) {
-    stream_ = new TestQuicSpdyServerStream(
-        QuicSpdySessionPeer::GetNthClientInitiatedStreamId(session_, 0),
-        &session_);
+    stream_ = new TestQuicSpdyServerStream(kClientDataStreamId1, &session_);
     session_.ActivateStream(QuicWrapUnique(stream_));
   }