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

net/quic/test_tools/quic_test_utils.cc

 // Copyright (c) 2012 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/quic/test_tools/quic_test_utils.h"
 
 #include <algorithm>
 #include <memory>
 
 #include "net/quic/core/crypto/crypto_framer.h"
@@ skipping 818 matching lines @@
       helper, alarm_factory, Perspective::IS_SERVER, supported_versions);
   *server_session = new TestQuicSpdyServerSession(
       *server_connection, DefaultQuicConfig(), server_crypto_config,
       compressed_certs_cache);
 
   // We advance the clock initially because the default time is zero and the
   // strike register worries that we've just overflowed a uint32_t time.
   (*server_connection)->AdvanceTime(connection_start_time);
 }
 
-QuicStreamId QuicClientDataStreamId(int i) {
-  return kClientDataStreamId1 + 2 * i;
+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;
 }
 
 }  // namespace test
 }  // namespace net