Land Recent QUIC Changes.

net/quic/quic_packet_creator_test.cc

Index: net/quic/quic_packet_creator_test.cc
diff --git a/net/quic/quic_packet_creator_test.cc b/net/quic/quic_packet_creator_test.cc
index 7b3881997a0d51a0f96b5d3250b8d051cfa7703b..33f2e5c3010aa94bcf0307d634f571f325a7be9f 100644
--- a/net/quic/quic_packet_creator_test.cc
+++ b/net/quic/quic_packet_creator_test.cc
@@ -374,8 +374,6 @@ TEST_F(QuicPacketCreatorTest, StreamFrameConsumption) {
 }
 
 TEST_F(QuicPacketCreatorTest, CryptoStreamFramePacketPadding) {
-  ValueRestore<bool> old_flag(&FLAGS_pad_quic_handshake_packets, true);
-
   // Compute the total overhead for a single frame in packet.
   const size_t overhead = GetPacketHeaderOverhead() + GetEncryptionOverhead()
       + GetStreamFrameOverhead();
@@ -408,10 +406,7 @@ TEST_F(QuicPacketCreatorTest, CryptoStreamFramePacketPadding) {
   }
 }
 
-
 TEST_F(QuicPacketCreatorTest, NonCryptoStreamFramePacketNonPadding) {
-  ValueRestore<bool> old_flag(&FLAGS_pad_quic_handshake_packets, true);
-
   // Compute the total overhead for a single frame in packet.
   const size_t overhead = GetPacketHeaderOverhead() + GetEncryptionOverhead()
       + GetStreamFrameOverhead();