Landing Recent QUIC changes until 7/26/2016 13:53 UTC

net/quic/quic_crypto_server_stream.h

Index: net/quic/quic_crypto_server_stream.h
diff --git a/net/quic/quic_crypto_server_stream.h b/net/quic/quic_crypto_server_stream.h
index 77711b820c372c63cb87c69a9bbb054a8d1f2ff8..f7137465cd2c0c8976195c3d523fc9ac3c38aeb9 100644
--- a/net/quic/quic_crypto_server_stream.h
+++ b/net/quic/quic_crypto_server_stream.h
@@ -124,6 +124,7 @@ class NET_EXPORT_PRIVATE QuicCryptoServerStream
   virtual QuicErrorCode ProcessClientHello(
       const CryptoHandshakeMessage& message,
       const ValidateClientHelloResultCallback::Result& result,
+      std::unique_ptr<ProofSource::Details> proof_source_details,
       CryptoHandshakeMessage* reply,
       DiversificationNonce* out_diversification_nonce,
       std::string* error_details);
@@ -149,7 +150,8 @@ class NET_EXPORT_PRIVATE QuicCryptoServerStream
 
     // From ValidateClientHelloResultCallback
     void RunImpl(const CryptoHandshakeMessage& client_hello,
-                 const Result& result) override;
+                 const Result& result,
+                 std::unique_ptr<ProofSource::Details> details) override;
 
    private:
     QuicCryptoServerStream* parent_;
@@ -180,7 +182,8 @@ class NET_EXPORT_PRIVATE QuicCryptoServerStream
   // hello message and handles handshake success/failure.
   void FinishProcessingHandshakeMessage(
       const CryptoHandshakeMessage& message,
-      const ValidateClientHelloResultCallback::Result& result);
+      const ValidateClientHelloResultCallback::Result& result,
+      std::unique_ptr<ProofSource::Details> details);
 
   // Invoked by SendServerConfigUpdateCallback::RunImpl once the proof has been
   // received.  |ok| indicates whether or not the proof was successfully