Landing Recent QUIC changes until 10:38 AM, Oct 17, 2016 UTC-4

net/quic/core/quic_crypto_server_stream.h

Index: net/quic/core/quic_crypto_server_stream.h
diff --git a/net/quic/core/quic_crypto_server_stream.h b/net/quic/core/quic_crypto_server_stream.h
index 4ce02b5cd24937a9fc19ddd5b054adca7d380a5a..fc0513171bfed5e7948e80069eba0b69872fbe2d 100644
--- a/net/quic/core/quic_crypto_server_stream.h
+++ b/net/quic/core/quic_crypto_server_stream.h
@@ -125,12 +125,10 @@ class NET_EXPORT_PRIVATE QuicCryptoServerStream
       CachedNetworkParameters cached_network_params) override;
 
  protected:
-  virtual QuicErrorCode ProcessClientHello(
+  virtual void ProcessClientHello(
       scoped_refptr<ValidateClientHelloResultCallback::Result> result,
       std::unique_ptr<ProofSource::Details> proof_source_details,
-      CryptoHandshakeMessage* reply,
-      DiversificationNonce* out_diversification_nonce,
-      std::string* error_details);
+      std::unique_ptr<ProcessClientHelloResultCallback> done_cb);
 
   // Hook that allows the server to set QuicConfig defaults just
   // before going through the parameter negotiation step.