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

net/quic/test_tools/quic_test_utils.h

Index: net/quic/test_tools/quic_test_utils.h
diff --git a/net/quic/test_tools/quic_test_utils.h b/net/quic/test_tools/quic_test_utils.h
index f3c0cea7c8a29311a00e41ce7dbf725ad9dc6a65..cbb63b8e2a6fb8e2fb6598f10034f11c794091ac 100644
--- a/net/quic/test_tools/quic_test_utils.h
+++ b/net/quic/test_tools/quic_test_utils.h
@@ -24,7 +24,6 @@
 #include "net/quic/core/quic_sent_packet_manager.h"
 #include "net/quic/core/quic_server_session_base.h"
 #include "net/quic/core/quic_simple_buffer_allocator.h"
-#include "net/quic/platform/api/quic_ptr_util.h"
 #include "net/quic/platform/api/quic_string_piece.h"
 #include "net/quic/test_tools/mock_clock.h"
 #include "net/quic/test_tools/mock_random.h"
@@ -49,6 +48,11 @@
     1024 * 1024;  // 1 MB
 static const uint32_t kInitialSessionFlowControlWindowForTest =
     1536 * 1024;  // 1.5 MB
+// Data stream IDs start at 5: the crypto stream is 1, headers stream is 3.
+static const QuicStreamId kClientDataStreamId1 = 5;
+static const QuicStreamId kClientDataStreamId2 = 7;
+static const QuicStreamId kClientDataStreamId3 = 9;
+static const QuicStreamId kServerDataStreamId1 = 4;
 
 // Returns the test peer IP address.
 QuicIpAddress TestPeerIPAddress();
@@ -479,9 +483,6 @@
                     ConnectionCloseSource source));
   MOCK_METHOD1(CreateIncomingDynamicStream, QuicStream*(QuicStreamId id));
   MOCK_METHOD1(CreateOutgoingDynamicStream, QuicStream*(SpdyPriority priority));
-  MOCK_METHOD1(MaybeCreateIncomingDynamicStream, QuicStream*(QuicStreamId id));
-  MOCK_METHOD1(MaybeCreateOutgoingDynamicStream,
-               QuicStream*(SpdyPriority priority));
   MOCK_METHOD1(ShouldCreateIncomingDynamicStream, bool(QuicStreamId id));
   MOCK_METHOD0(ShouldCreateOutgoingDynamicStream, bool());
   MOCK_METHOD6(
@@ -505,7 +506,6 @@
   MOCK_METHOD3(OnStreamHeadersComplete,
                void(QuicStreamId stream_id, bool fin, size_t frame_len));
   MOCK_CONST_METHOD0(IsCryptoHandshakeConfirmed, bool());
-  MOCK_METHOD1(CreateStream, std::unique_ptr<QuicStream>(QuicStreamId id));
 
   using QuicSession::ActivateStream;
 
@@ -550,7 +550,6 @@
                QuicSpdyStream*(SpdyPriority priority));
   MOCK_METHOD1(ShouldCreateIncomingDynamicStream, bool(QuicStreamId id));
   MOCK_METHOD0(ShouldCreateOutgoingDynamicStream, bool());
-  MOCK_METHOD1(CreateStream, std::unique_ptr<QuicStream>(QuicStreamId id));
   MOCK_METHOD6(
       WritevData,
       QuicConsumedData(
@@ -613,24 +612,6 @@
       OnStreamFrameData,
       void(QuicStreamId stream_id, const char* data, size_t len, bool fin));
 
-  QuicSpdyStream* QuicSpdySessionMaybeCreateIncomingDynamicStream(
-      QuicStreamId id) {
-    return QuicSpdySession::MaybeCreateIncomingDynamicStream(id);
-  }
-
-  bool QuicSpdySessionShouldCreateIncomingDynamicStream2(QuicStreamId id) {
-    return QuicSpdySession::ShouldCreateIncomingDynamicStream2(id);
-  }
-
-  QuicSpdyStream* QuicSpdySessionMaybeCreateOutgoingDynamicStream(
-      SpdyPriority priority) {
-    return QuicSpdySession::MaybeCreateOutgoingDynamicStream(priority);
-  }
-
-  bool QuicSpdySessionShouldCreateOutgoingDynamicStream2() {
-    return QuicSpdySession::ShouldCreateOutgoingDynamicStream2();
-  }
-
   using QuicSession::ActivateStream;
 
  private:
@@ -652,7 +633,6 @@
   MOCK_METHOD1(CreateIncomingDynamicStream, QuicSpdyStream*(QuicStreamId id));
   MOCK_METHOD1(CreateOutgoingDynamicStream,
                QuicSpdyStream*(SpdyPriority priority));
-  MOCK_METHOD1(CreateStream, std::unique_ptr<QuicStream>(QuicStreamId id));
   QuicCryptoServerStreamBase* CreateQuicCryptoServerStream(
       const QuicCryptoServerConfig* crypto_config,
       QuicCompressedCertsCache* compressed_certs_cache) override;
@@ -714,8 +694,6 @@
                QuicSpdyStream*(SpdyPriority priority));
   MOCK_METHOD1(ShouldCreateIncomingDynamicStream, bool(QuicStreamId id));
   MOCK_METHOD0(ShouldCreateOutgoingDynamicStream, bool());
-
-  MOCK_METHOD1(CreateStream, std::unique_ptr<QuicStream>(QuicStreamId id));
 
   QuicCryptoClientStream* GetMutableCryptoStream() override;
   const QuicCryptoClientStream* GetCryptoStream() const override;
@@ -970,6 +948,10 @@
     PacketSavingConnection** server_connection,
     TestQuicSpdyServerSession** server_session);
 
+// Helper to generate client side stream ids, generalizes
+// kClientDataStreamId1 etc. above.
+QuicStreamId QuicClientDataStreamId(int i);
+
 // Verifies that the relative error of |actual| with respect to |expected| is
 // no more than |margin|.
 
@@ -1008,12 +990,6 @@
   return quic_iov;
 }
 
-// Utilities that will adapt stream ids when http stream pairs are
-// enabled.
-QuicStreamId NextStreamId(QuicVersion version);
-QuicStreamId GetNthClientInitiatedStreamId(QuicVersion version, int n);
-QuicStreamId GetNthServerInitiatedStreamId(QuicVersion version, int n);
-
 }  // namespace test
 }  // namespace net