Land Recent QUIC Changes until 03/06/2015.

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 900bb150f454907707888a0c7ced3058497f529c..b88ac84480d85cb2ddd089aa6d35b733ee4eea2d 100644
--- a/net/quic/test_tools/quic_test_utils.h
+++ b/net/quic/test_tools/quic_test_utils.h
@@ -34,10 +34,9 @@ namespace test {
 static const QuicConnectionId kTestConnectionId = 42;
 static const uint16 kTestPort = 123;
 static const uint32 kInitialStreamFlowControlWindowForTest =
-    32 * 1024;  // 32 KB
+    1024 * 1024;  // 1 MB
 static const uint32 kInitialSessionFlowControlWindowForTest =
-    64 * 1024;  // 64 KB
-
+    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;
@@ -66,6 +65,17 @@ QuicEncryptedPacket* ConstructEncryptedPacket(
     bool version_flag,
     bool reset_flag,
     QuicPacketSequenceNumber sequence_number,
+    const std::string& data,
+    QuicConnectionIdLength connection_id_length,
+    QuicSequenceNumberLength sequence_number_length);
+
+// This form assumes |connection_id_length| == PACKET_8BYTE_CONNECTION_ID and
+// |sequence_number_length| == PACKET_6BYTE_SEQUENCE_NUMBER.
+QuicEncryptedPacket* ConstructEncryptedPacket(
+    QuicConnectionId connection_id,
+    bool version_flag,
+    bool reset_flag,
+    QuicPacketSequenceNumber sequence_number,
     const std::string& data);
 
 void CompareCharArraysWithHexError(const std::string& description,