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

net/quic/test_tools/quic_test_utils.cc

Index: net/quic/test_tools/quic_test_utils.cc
diff --git a/net/quic/test_tools/quic_test_utils.cc b/net/quic/test_tools/quic_test_utils.cc
index 7aff53725243cab7fafd0695b8f95c07bb4d5c4a..613c18845a28190ed171f6a1d45ad71cb9ea6dee 100644
--- a/net/quic/test_tools/quic_test_utils.cc
+++ b/net/quic/test_tools/quic_test_utils.cc
@@ -836,18 +836,8 @@
   (*server_connection)->AdvanceTime(connection_start_time);
 }
 
-QuicStreamId NextStreamId(QuicVersion version) {
-  // TODO(ckrasic) - when version for http stream pairs re-lands, this
-  // will be conditional.
-  return 2;
-}
-
-QuicStreamId GetNthClientInitiatedStreamId(QuicVersion version, int n) {
-  return 5 + NextStreamId(version) * n;
-}
-
-QuicStreamId GetNthServerInitiatedStreamId(QuicVersion version, int n) {
-  return 2 + NextStreamId(version) * n;
+QuicStreamId QuicClientDataStreamId(int i) {
+  return kClientDataStreamId1 + 2 * i;
 }
 
 }  // namespace test