Landing Recent QUIC changes until Mon Apr 17 2017

net/quic/core/crypto/quic_crypto_server_config.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_QUIC_CORE_CRYPTO_QUIC_CRYPTO_SERVER_CONFIG_H_
 #define NET_QUIC_CORE_CRYPTO_QUIC_CRYPTO_SERVER_CONFIG_H_
 
 #include <cstddef>
 #include <cstdint>
 #include <map>
@@ skipping 331 matching lines @@
       const QuicIpAddress& client_ip,
       const QuicClock* clock,
       QuicRandom* rand,
       QuicCompressedCertsCache* compressed_certs_cache,
       const QuicCryptoNegotiatedParameters& params,
       const CachedNetworkParameters* cached_network_params,
       const QuicTagVector& connection_options,
       std::unique_ptr<BuildServerConfigUpdateMessageResultCallback> cb) const;
 
   // SetEphemeralKeySource installs an object that can cache ephemeral keys for
-  // a short period of time. This object takes ownership of
-  // |ephemeral_key_source|. If not set then ephemeral keys will be generated
+  // a short period of time. If not set, ephemeral keys will be generated
   // per-connection.
-  void SetEphemeralKeySource(EphemeralKeySource* ephemeral_key_source);
+  void SetEphemeralKeySource(
+      std::unique_ptr<EphemeralKeySource> ephemeral_key_source);
 
   // set_replay_protection controls whether replay protection is enabled. If
   // replay protection is disabled then no strike registers are needed and
   // frontends can share an orbit value without a shared strike-register.
   // However, an attacker can duplicate a handshake and cause a client's
   // request to be processed twice.
   void set_replay_protection(bool on);
 
   // set_chlo_multiplier specifies the multiple of the CHLO message size
   // that a REJ message must stay under when the client doesn't present a
@@ skipping 404 matching lines @@
   QuicReferenceCountedPointer<QuicCryptoServerConfig::Config> config;
   std::string primary_scid;
 
  protected:
   ~QuicSignedServerConfig() override;
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CORE_CRYPTO_QUIC_CRYPTO_SERVER_CONFIG_H_