[Merge to 2881 for release cherry-picking] Re-enable the QUIC v33 hacks. protected by FLAGS_quic_re…

net/quic/core/quic_framer_test.cc

Index: net/quic/core/quic_framer_test.cc
diff --git a/net/quic/core/quic_framer_test.cc b/net/quic/core/quic_framer_test.cc
index 0ce097352de99b25e06355b2decc2a74e1d64b00..927b97d23527cae4f7e125cb643af16754b1ee70 100644
--- a/net/quic/core/quic_framer_test.cc
+++ b/net/quic/core/quic_framer_test.cc
@@ -4904,7 +4904,8 @@ TEST_P(QuicFramerTest, BuildStreamFramePacketWithVersionFlag) {
   unsigned char packet[] = {
       // public flags (version, 8 byte connection_id)
       static_cast<unsigned char>(
-          framer_.version() > QUIC_VERSION_32 ? 0x39 : 0x3D),
+          (FLAGS_quic_remove_v33_hacks2 &&
+            framer_.version() > QUIC_VERSION_32) ? 0x39 : 0x3D),
       // connection_id
       0x10, 0x32, 0x54, 0x76, 0x98, 0xBA, 0xDC, 0xFE,
       // version tag
@@ -4925,7 +4926,8 @@ TEST_P(QuicFramerTest, BuildStreamFramePacketWithVersionFlag) {
   };
   unsigned char packet_34[] = {
       // public flags (version, 8 byte connection_id)
-      0x39,
+      static_cast<unsigned char>(
+          FLAGS_quic_remove_v33_hacks2 ? 0x39 : 0x3D),
       // connection_id
       0x10, 0x32, 0x54, 0x76, 0x98, 0xBA, 0xDC, 0xFE,
       // version tag
@@ -5057,7 +5059,8 @@ TEST_P(QuicFramerTest, BuildStreamFramePacketWithBothVersionAndMultipathFlag) {
   unsigned char packet[] = {
     // public flags (8 byte connection_id)
     static_cast<unsigned char>(
-        framer_.version() > QUIC_VERSION_32 ? 0x79 : 0x7D),
+        (FLAGS_quic_remove_v33_hacks2 &&
+         framer_.version() > QUIC_VERSION_32) ? 0x79 : 0x7D),
     // connection_id
     0x10, 0x32, 0x54, 0x76,
     0x98, 0xBA, 0xDC, 0xFE,
@@ -5085,7 +5088,8 @@ TEST_P(QuicFramerTest, BuildStreamFramePacketWithBothVersionAndMultipathFlag) {
   };
   unsigned char packet_34[] = {
     // public flags (8 byte connection_id)
-    0x79,
+    static_cast<unsigned char>(
+        FLAGS_quic_remove_v33_hacks2 ? 0x79 : 0x7D),
     // connection_id
     0x10, 0x32, 0x54, 0x76,
     0x98, 0xBA, 0xDC, 0xFE,