Landing Recent QUIC changes until 3:24 PM, Oct 01, 2016 UTC-4

net/tools/quic/stateless_rejector.h

Index: net/tools/quic/stateless_rejector.h
diff --git a/net/tools/quic/stateless_rejector.h b/net/tools/quic/stateless_rejector.h
index 195324e5e6760dc15ef1ab738d509cc6522e8eda..c8dcd4b97c8d1a5a26c3ec4ab55e7da09fa19978 100644
--- a/net/tools/quic/stateless_rejector.h
+++ b/net/tools/quic/stateless_rejector.h
@@ -67,7 +67,7 @@ class StatelessRejector {
   QuicConnectionId connection_id() const { return connection_id_; }
 
   // Returns the SREJ message when state() returns REJECTED.
-  const CryptoHandshakeMessage& reply() const { return reply_; }
+  const CryptoHandshakeMessage& reply() const { return *reply_; }
 
  private:
   // Helper class which is passed in to
@@ -75,11 +75,21 @@ class StatelessRejector {
   class ValidateCallback;
   friend class ValidateCallback;
 
+  class ProcessClientHelloCallback;
+  friend class ProcessClientHelloCallback;
+
   void ProcessClientHello(
       scoped_refptr<ValidateClientHelloResultCallback::Result> result,
       std::unique_ptr<StatelessRejector> rejector,
       std::unique_ptr<StatelessRejector::ProcessDoneCallback> done_cb);
 
+  void ProcessClientHelloDone(
+      QuicErrorCode error,
+      const std::string& error_details,
+      std::unique_ptr<CryptoHandshakeMessage> message,
+      std::unique_ptr<StatelessRejector> rejector,
+      std::unique_ptr<StatelessRejector::ProcessDoneCallback> done_cb);
+
   State state_;
   QuicErrorCode error_;
   std::string error_details_;
@@ -95,9 +105,10 @@ class StatelessRejector {
   const QuicCryptoServerConfig* crypto_config_;
   QuicCompressedCertsCache* compressed_certs_cache_;
   CryptoHandshakeMessage chlo_;
-  CryptoHandshakeMessage reply_;
+  std::unique_ptr<CryptoHandshakeMessage> reply_;
   CryptoFramer crypto_framer_;
   QuicCryptoProof proof_;
+  QuicCryptoNegotiatedParameters params_;
 
   DISALLOW_COPY_AND_ASSIGN(StatelessRejector);
 };