QUIC - enabled FLAGS_allow_truncated_connection_ids_for_quic

net/quic/test_tools/quic_test_packet_maker.cc

Index: net/quic/test_tools/quic_test_packet_maker.cc
diff --git a/net/quic/test_tools/quic_test_packet_maker.cc b/net/quic/test_tools/quic_test_packet_maker.cc
index 65404264643876614d13fbdb49efd24d86661dc8..c6828cc965cb28bcbb81a8140d370ccb491b4727 100644
--- a/net/quic/test_tools/quic_test_packet_maker.cc
+++ b/net/quic/test_tools/quic_test_packet_maker.cc
@@ -31,11 +31,13 @@ QuicTestPacketMaker::~QuicTestPacketMaker() {
 
 scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeRstPacket(
     QuicPacketSequenceNumber num,
+    QuicConnectionIdLength connection_id_length,
     bool include_version,
     QuicStreamId stream_id,
     QuicRstStreamErrorCode error_code) {
   QuicPacketHeader header;
   header.public_header.connection_id = connection_id_;
+  header.public_header.connection_id_length = connection_id_length;
   header.public_header.reset_flag = false;
   header.public_header.version_flag = include_version;
   header.public_header.sequence_number_length = PACKET_1BYTE_SEQUENCE_NUMBER;
@@ -56,9 +58,9 @@ scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeAckAndRstPacket(
     QuicPacketSequenceNumber largest_received,
     QuicPacketSequenceNumber least_unacked,
     bool send_feedback) {
-
   QuicPacketHeader header;
   header.public_header.connection_id = connection_id_;
+  header.public_header.connection_id_length = PACKET_8BYTE_CONNECTION_ID;
   header.public_header.reset_flag = false;
   header.public_header.version_flag = include_version;
   header.public_header.sequence_number_length = PACKET_1BYTE_SEQUENCE_NUMBER;
@@ -103,6 +105,7 @@ scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeConnectionClosePacket(
     QuicPacketSequenceNumber num) {
   QuicPacketHeader header;
   header.public_header.connection_id = connection_id_;
+  header.public_header.connection_id_length = PACKET_0BYTE_CONNECTION_ID;
   header.public_header.reset_flag = false;
   header.public_header.version_flag = false;
   header.public_header.sequence_number_length = PACKET_1BYTE_SEQUENCE_NUMBER;
@@ -119,11 +122,13 @@ scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeConnectionClosePacket(
 
 scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeAckPacket(
     QuicPacketSequenceNumber sequence_number,
+    QuicConnectionIdLength connection_id_length,
     QuicPacketSequenceNumber largest_received,
     QuicPacketSequenceNumber least_unacked,
     bool send_feedback) {
   QuicPacketHeader header;
   header.public_header.connection_id = connection_id_;
+  header.public_header.connection_id_length = connection_id_length;
   header.public_header.reset_flag = false;
   header.public_header.version_flag = false;
   header.public_header.sequence_number_length = PACKET_1BYTE_SEQUENCE_NUMBER;
@@ -169,7 +174,8 @@ scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeDataPacket(
     bool fin,
     QuicStreamOffset offset,
     base::StringPiece data) {
-  InitializeHeader(sequence_number, should_include_version);
+  InitializeHeader(sequence_number, PACKET_8BYTE_CONNECTION_ID,
+                   should_include_version);
   QuicStreamFrame frame(stream_id, fin, offset, MakeIOVector(data));
   return MakePacket(header_, QuicFrame(&frame));
 }
@@ -177,10 +183,12 @@ scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeDataPacket(
 scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeRequestHeadersPacket(
     QuicPacketSequenceNumber sequence_number,
     QuicStreamId stream_id,
+    QuicConnectionIdLength connection_id_length,
     bool should_include_version,
     bool fin,
     const SpdyHeaderBlock& headers) {
-  InitializeHeader(sequence_number, should_include_version);
+  InitializeHeader(sequence_number, connection_id_length,
+                   should_include_version);
   SpdySynStreamIR syn_stream(stream_id);
   syn_stream.set_name_value_block(headers);
   syn_stream.set_fin(fin);
@@ -196,10 +204,12 @@ scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeRequestHeadersPacket(
 scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakeResponseHeadersPacket(
     QuicPacketSequenceNumber sequence_number,
     QuicStreamId stream_id,
+    QuicConnectionIdLength connection_id_length,
     bool should_include_version,
     bool fin,
     const SpdyHeaderBlock& headers) {
-  InitializeHeader(sequence_number, should_include_version);
+  InitializeHeader(sequence_number, connection_id_length,
+                   should_include_version);
   SpdySynReplyIR syn_reply(stream_id);
   syn_reply.set_name_value_block(headers);
   syn_reply.set_fin(fin);
@@ -247,8 +257,10 @@ scoped_ptr<QuicEncryptedPacket> QuicTestPacketMaker::MakePacket(
 
 void QuicTestPacketMaker::InitializeHeader(
     QuicPacketSequenceNumber sequence_number,
+    QuicConnectionIdLength connection_id_length,
     bool should_include_version) {
   header_.public_header.connection_id = connection_id_;
+  header_.public_header.connection_id_length = connection_id_length;
   header_.public_header.reset_flag = false;
   header_.public_header.version_flag = should_include_version;
   header_.public_header.sequence_number_length = PACKET_1BYTE_SEQUENCE_NUMBER;