Landing recent QUIC changes until 6/24/2016 14:00 UTC

net/quic/quic_protocol.h

Index: net/quic/quic_protocol.h
diff --git a/net/quic/quic_protocol.h b/net/quic/quic_protocol.h
index 91fcf8c1f38f800b04cb33041f9b912101f5b3ca..d5b6c5383cc9805b861ac9f1d9c821fce976aa28 100644
--- a/net/quic/quic_protocol.h
+++ b/net/quic/quic_protocol.h
@@ -371,6 +371,7 @@ enum QuicVersion {
   QUIC_VERSION_33 = 33,  // Adds diversification nonces.
   QUIC_VERSION_34 = 34,  // Deprecates entropy, removes private flag from packet
                          // header, uses new ack and stop waiting wire format.
+  QUIC_VERSION_35 = 35,  // Allows endpoints to independently set stream limit.
 };
 
 // This vector contains QUIC versions which we currently support.
@@ -381,9 +382,9 @@ enum QuicVersion {
 // IMPORTANT: if you are adding to this list, follow the instructions at
 // http://sites/quic/adding-and-removing-versions
 static const QuicVersion kSupportedQuicVersions[] = {
-    QUIC_VERSION_34, QUIC_VERSION_33, QUIC_VERSION_32, QUIC_VERSION_31,
-    QUIC_VERSION_30, QUIC_VERSION_29, QUIC_VERSION_28, QUIC_VERSION_27,
-    QUIC_VERSION_26, QUIC_VERSION_25};
+    QUIC_VERSION_35, QUIC_VERSION_34, QUIC_VERSION_33, QUIC_VERSION_32,
+    QUIC_VERSION_31, QUIC_VERSION_30, QUIC_VERSION_29, QUIC_VERSION_28,
+    QUIC_VERSION_27, QUIC_VERSION_26, QUIC_VERSION_25};
 
 typedef std::vector<QuicVersion> QuicVersionVector;
 
@@ -1357,6 +1358,17 @@ class NET_EXPORT_PRIVATE QuicAckListenerInterface
   virtual ~QuicAckListenerInterface() {}
 };
 
+// Pure virtual class to close connection on unrecoverable errors.
+class NET_EXPORT_PRIVATE QuicConnectionCloseDelegateInterface {
+ public:
+  virtual ~QuicConnectionCloseDelegateInterface() {}
+
+  // Called when an unrecoverable error is encountered.
+  virtual void OnUnrecoverableError(QuicErrorCode error,
+                                    const std::string& error_details,
+                                    ConnectionCloseSource source) = 0;
+};
+
 struct NET_EXPORT_PRIVATE AckListenerWrapper {
   AckListenerWrapper(QuicAckListenerInterface* listener,
                      QuicPacketLength data_length);