Landing Recent QUIC changes until 5:55 PM, Aug 25, 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 a48f6b6a4ecc6ca93ba473b68301ff0a4961bade..ffac09c0df5d5b8b852a5bf8d2d7f3396107cc93 100644
--- a/net/quic/core/quic_crypto_server_stream.h
+++ b/net/quic/core/quic_crypto_server_stream.h
@@ -114,11 +114,6 @@ class NET_EXPORT_PRIVATE QuicCryptoServerStream
   // before going through the parameter negotiation step.
   virtual void OverrideQuicConfigDefaults(QuicConfig* config);
 
-  // Given the current connection_id, generates a new ConnectionId to
-  // be returned with a stateless reject.
-  virtual QuicConnectionId GenerateConnectionIdForReject(
-      QuicConnectionId connection_id);
-
  private:
   friend class test::CryptoTestUtils;
   friend class test::QuicCryptoServerStreamPeer;
@@ -173,6 +168,10 @@ class NET_EXPORT_PRIVATE QuicCryptoServerStream
   void FinishSendServerConfigUpdate(bool ok,
                                     const CryptoHandshakeMessage& message);
 
+  // Returns a new ConnectionId to be used for statelessly rejected connections
+  // if |use_stateless_rejects| is true. Returns 0 otherwise.
+  QuicConnectionId GenerateConnectionIdForReject(bool use_stateless_rejects);
+
   // crypto_config_ contains crypto parameters for the handshake.
   const QuicCryptoServerConfig* crypto_config_;