Landing Recent QUIC changes until 10:38 AM, Oct 17, 2016 UTC-4

net/quic/core/quic_packet_generator_test.cc

Index: net/quic/core/quic_packet_generator_test.cc
diff --git a/net/quic/core/quic_packet_generator_test.cc b/net/quic/core/quic_packet_generator_test.cc
index 782d28ea26a2e8e4094d3c27743f7a57eb60b4b7..09ed821bc270ddfb14d0dd979c3ec0105b01a912 100644
--- a/net/quic/core/quic_packet_generator_test.cc
+++ b/net/quic/core/quic_packet_generator_test.cc
@@ -207,7 +207,6 @@ class QuicPacketGeneratorTest : public ::testing::Test {
     return ::net::MakeIOVector(s, &iov_);
   }
 
-  QuicFlagSaver flags_;  // Save/restore all QUIC flag values.
   QuicFramer framer_;
   MockRandom random_;
   SimpleBufferAllocator buffer_allocator_;
@@ -879,7 +878,6 @@ TEST_F(QuicPacketGeneratorTest, SetCurrentPath) {
 
 // Regression test for b/31486443.
 TEST_F(QuicPacketGeneratorTest, ConnectionCloseFrameLargerThanPacketSize) {
-  FLAGS_quic_close_connection_on_huge_frames = true;
   delegate_.SetCanWriteAnything();
   QuicConnectionCloseFrame* frame = new QuicConnectionCloseFrame();
   frame->error_code = QUIC_PACKET_WRITE_ERROR;