Landing Recent QUIC changes until Sat Sep 10 00:32:41

net/quic/core/quic_connection.h

Index: net/quic/core/quic_connection.h
diff --git a/net/quic/core/quic_connection.h b/net/quic/core/quic_connection.h
index 0f87039df8068609dd6168fa32849e2a19980de6..16ef1396f271cd362989b33c04ae9766f48a68d2 100644
--- a/net/quic/core/quic_connection.h
+++ b/net/quic/core/quic_connection.h
@@ -571,7 +571,7 @@ class NET_EXPORT_PRIVATE QuicConnection
   // SetNonceForPublicHeader sets the nonce that will be transmitted in the
   // public header of each packet encrypted at the initial encryption level
   // decrypted. This should only be called on the server side.
-  void SetDiversificationNonce(const DiversificationNonce nonce);
+  void SetDiversificationNonce(const DiversificationNonce& nonce);
 
   // SetDefaultEncryptionLevel sets the encryption level that will be applied
   // to new packets.
@@ -880,11 +880,6 @@ class NET_EXPORT_PRIVATE QuicConnection
   // Encryption level for new packets. Should only be changed via
   // SetDefaultEncryptionLevel().
   EncryptionLevel encryption_level_;
-  bool has_forward_secure_encrypter_;
-  // The packet number of the first packet which will be encrypted with the
-  // foward-secure encrypter, even if the peer has not started sending
-  // forward-secure packets.
-  QuicPacketNumber first_required_forward_secure_packet_;
   const QuicClock* clock_;
   QuicRandom* random_generator_;