[Merge m54] Re-enable the QUIC v33 hacks. protected by FLAGS_quic_remove_v33_hacks2

net/quic/core/quic_flags.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/core/quic_flags.h"
 
 // If true, it will return as soon as an error is detected while validating
 // CHLO.
 bool FLAGS_use_early_return_when_verifying_chlo = true;
 
@@ skipping 128 matching lines @@
 // If true, close the write side of a QUIC spdy stream when all queued bytes
 // have been written and a FIN has been sent.
 bool FLAGS_quic_close_stream_after_writing_queued_data = false;
 
 // If true, close connection with QUIC_TOO_MANY_FRAME_GAPS error when number of
 // gaps in QuicStreamSequenceBuffer exceeds allowed limit.
 bool FLAGS_quic_limit_frame_gaps_in_buffer = false;
 
 // If true, v33 QUIC client uses 1 bit to specify 8-byte connection id in public
 // flag.
-bool FLAGS_quic_remove_v33_hacks = true;
+bool FLAGS_quic_remove_v33_hacks = false;
 
 // If true, use the CHLO packet size, not message size when determining how
 // large a REJ can be.
 bool FLAGS_quic_use_chlo_packet_size = false;
 
 // If true, defer creation of new connection till its CHLO arrives.
 bool FLAGS_quic_buffer_packet_till_chlo = false;
 
 // If true, the connection will check whether it is application-limited, and
 // notify the congestion controller about it.
 bool FLAGS_quic_enable_app_limited_check = true;
 
 // Deprecate QuicPacketCreator::next_packet_number_length_ because it's no
 // longer necessary.
 bool FLAGS_quic_simple_packet_number_length_2 = true;
 
 // If true, disables QUIC version less than 32.
 bool FLAGS_quic_disable_pre_32 = true;
 
 // If true, set a QUIC connection's last_sent_for_timeout_ to the send time of
 // the first packet sent after receiving a packet, even if the sent packet is
 // a retransmission
 bool FLAGS_quic_better_last_send_for_timeout = true;