Land Recent QUIC Changes until 05/13/2015

net/quic/quic_crypto_client_stream.h

Index: net/quic/quic_crypto_client_stream.h
diff --git a/net/quic/quic_crypto_client_stream.h b/net/quic/quic_crypto_client_stream.h
index 230cb9422934d4849cd5fcf50aac52bd3d850a34..a60ce7805f4340691020234d8f4b4b310318215e 100644
--- a/net/quic/quic_crypto_client_stream.h
+++ b/net/quic/quic_crypto_client_stream.h
@@ -209,6 +209,11 @@ class NET_EXPORT_PRIVATE QuicCryptoClientStream : public QuicCryptoStream {
   std::string verify_error_details_;
   scoped_ptr<ProofVerifyDetails> verify_details_;
 
+  // True if the server responded to a previous CHLO with a stateless
+  // reject.  Used for book-keeping between the STATE_RECV_REJ,
+  // STATE_VERIFY_PROOF*, and subsequent STATE_SEND_CHLO state.
+  bool stateless_reject_received_;
+
   DISALLOW_COPY_AND_ASSIGN(QuicCryptoClientStream);
 };