QUIC - enabled FLAGS_allow_truncated_connection_ids_for_quic

net/quic/quic_http_stream_test.cc

Index: net/quic/quic_http_stream_test.cc
diff --git a/net/quic/quic_http_stream_test.cc b/net/quic/quic_http_stream_test.cc
index a172c2486b56191e00135e16785da7c084209315..5f91ac9760fb4a8fc573328cfdb63fb338633424 100644
--- a/net/quic/quic_http_stream_test.cc
+++ b/net/quic/quic_http_stream_test.cc
@@ -265,44 +265,47 @@ class QuicHttpStreamTest : public ::testing::TestWithParam<QuicVersion> {
       bool fin,
       QuicStreamOffset offset,
       base::StringPiece data) {
-    return maker_.MakeDataPacket(
-        sequence_number, stream_id_, should_include_version, fin, offset, data);
+    return maker_.MakeDataPacket(sequence_number, stream_id_,
+                                 should_include_version, fin, offset, data);
   }
 
   scoped_ptr<QuicEncryptedPacket> ConstructRequestHeadersPacket(
       QuicPacketSequenceNumber sequence_number,
       bool fin) {
     return maker_.MakeRequestHeadersPacket(
-        sequence_number, stream_id_, kIncludeVersion, fin, request_headers_);
+        sequence_number, stream_id_, PACKET_8BYTE_CONNECTION_ID,
+        kIncludeVersion, fin, request_headers_);
   }
 
   scoped_ptr<QuicEncryptedPacket> ConstructResponseHeadersPacket(
       QuicPacketSequenceNumber sequence_number,
       bool fin) {
     return maker_.MakeResponseHeadersPacket(
-        sequence_number, stream_id_, !kIncludeVersion, fin, response_headers_);
+        sequence_number, stream_id_, PACKET_0BYTE_CONNECTION_ID,
+        !kIncludeVersion, fin, response_headers_);
   }
 
   scoped_ptr<QuicEncryptedPacket> ConstructRstStreamPacket(
       QuicPacketSequenceNumber sequence_number) {
     return maker_.MakeRstPacket(
-        sequence_number, true, stream_id_,
+        sequence_number, PACKET_8BYTE_CONNECTION_ID, true, stream_id_,
         AdjustErrorForVersion(QUIC_RST_ACKNOWLEDGEMENT, GetParam()));
   }
 
   scoped_ptr<QuicEncryptedPacket> ConstructAckAndRstStreamPacket(
       QuicPacketSequenceNumber sequence_number) {
-    return maker_.MakeAckAndRstPacket(
-        sequence_number, !kIncludeVersion, stream_id_, QUIC_STREAM_CANCELLED,
-        2, 1, !kIncludeCongestionFeedback);
+    return maker_.MakeAckAndRstPacket(sequence_number, !kIncludeVersion,
+                                      stream_id_, QUIC_STREAM_CANCELLED, 2, 1,
+                                      !kIncludeCongestionFeedback);
   }
 
   scoped_ptr<QuicEncryptedPacket> ConstructAckPacket(
       QuicPacketSequenceNumber sequence_number,
       QuicPacketSequenceNumber largest_received,
       QuicPacketSequenceNumber least_unacked) {
-    return maker_.MakeAckPacket(sequence_number, largest_received,
-                                least_unacked, !kIncludeCongestionFeedback);
+    return maker_.MakeAckPacket(sequence_number, PACKET_8BYTE_CONNECTION_ID,
+                                largest_received, least_unacked,
+                                !kIncludeCongestionFeedback);
   }
 
   BoundNetLog net_log_;