Landing Recent QUIC changes until 4AM, Aug 7, 2016 UTC-4

net/quic/core/quic_framer.cc

Index: net/quic/core/quic_framer.cc
diff --git a/net/quic/core/quic_framer.cc b/net/quic/core/quic_framer.cc
index 1dad3576946ccdb2ff2ed3ee3b9108bed4d838cd..8ad11c456d564762b07ddc6ad5afff0ee6c45960 100644
--- a/net/quic/core/quic_framer.cc
+++ b/net/quic/core/quic_framer.cc
@@ -721,8 +721,8 @@ bool QuicFramer::AppendPacketHeader(const QuicPacketHeader& header,
     case PACKET_8BYTE_CONNECTION_ID:
       if (quic_version_ > QUIC_VERSION_32) {
         public_flags |= PACKET_PUBLIC_FLAGS_8BYTE_CONNECTION_ID;
-        if (perspective_ == Perspective::IS_CLIENT) {
-          // TODO(rch): Fix this when v33 flags are supported by middle boxes.
+        if (!FLAGS_quic_remove_v33_hacks &&
+            perspective_ == Perspective::IS_CLIENT) {
           public_flags |= PACKET_PUBLIC_FLAGS_8BYTE_CONNECTION_ID_OLD;
         }