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

net/quic/test_tools/quic_spdy_session_peer.cc

Index: net/quic/test_tools/quic_spdy_session_peer.cc
diff --git a/net/quic/test_tools/quic_spdy_session_peer.cc b/net/quic/test_tools/quic_spdy_session_peer.cc
index eb1f52e6a7a8233996f0fd9f66f7e97b961e7e2f..37b76e1dc4f99e53e77a6792c5fad45de8760a4a 100644
--- a/net/quic/test_tools/quic_spdy_session_peer.cc
+++ b/net/quic/test_tools/quic_spdy_session_peer.cc
@@ -64,24 +64,5 @@
                                    std::move(ack_listener));
 }
 
-//  static
-QuicStreamId QuicSpdySessionPeer::NextStreamId(const QuicSpdySession& session) {
-  return 2;
-}
-
-//  static
-QuicStreamId QuicSpdySessionPeer::GetNthClientInitiatedStreamId(
-    const QuicSpdySession& session,
-    int n) {
-  return 5 + QuicSpdySessionPeer::NextStreamId(session) * n;
-}
-
-//  static
-QuicStreamId QuicSpdySessionPeer::GetNthServerInitiatedStreamId(
-    const QuicSpdySession& session,
-    int n) {
-  return 2 + QuicSpdySessionPeer::NextStreamId(session) * n;
-}
-
 }  // namespace test
 }  // namespace net