Landing Recent QUIC changes until Sun Apr 9 16:12:55

components/domain_reliability/quic_error_mapping.cc

Index: components/domain_reliability/quic_error_mapping.cc
diff --git a/components/domain_reliability/quic_error_mapping.cc b/components/domain_reliability/quic_error_mapping.cc
index 56d3c76591a260d833b408eab5d47b24c4d1c058..41283a567f8815399ceeac2192865a9cd9eddc91 100644
--- a/components/domain_reliability/quic_error_mapping.cc
+++ b/components/domain_reliability/quic_error_mapping.cc
@@ -126,8 +126,6 @@ const struct QuicErrorMapping {
     // Disabled QUIC because of too many PUBLIC_RESETs post handshake.
     {net::QUIC_PUBLIC_RESETS_POST_HANDSHAKE,
      "quic.public_resets_post_handshake"},
-    // Disabled QUIC because of too many timeouts with streams open.
-    {net::QUIC_TIMEOUTS_WITH_OPEN_STREAMS, "quic.timeouts_with_open_streams"},
     // Closed because we failed to serialize a packet.
     {net::QUIC_FAILED_TO_SERIALIZE_PACKET, "quic.failed_to_serialize_packet"},
     // QUIC timed out after too many RTOs.
@@ -253,7 +251,7 @@ const struct QuicErrorMapping {
 
 // Must be updated any time a net::QuicErrorCode is deprecated in
 // net/quic/core/quic_packets.h.
-const int kDeprecatedQuicErrorCount = 4;
+const int kDeprecatedQuicErrorCount = 5;
 const int kActiveQuicErrorCount =
     net::QUIC_LAST_ERROR - kDeprecatedQuicErrorCount;