Landing Recent QUIC changes until Mon Nov 14 04:43:50 2016 +0000

net/quic/test_tools/quic_crypto_server_config_peer.h

Index: net/quic/test_tools/quic_crypto_server_config_peer.h
diff --git a/net/quic/test_tools/quic_crypto_server_config_peer.h b/net/quic/test_tools/quic_crypto_server_config_peer.h
index 6f5794de9771221724f1f5530cfafd0a6f860ee7..9c98ccc92a93c9595d2aa24a2fd755beb89aed04 100644
--- a/net/quic/test_tools/quic_crypto_server_config_peer.h
+++ b/net/quic/test_tools/quic_crypto_server_config_peer.h
@@ -56,13 +56,6 @@ class QuicCryptoServerConfigPeer {
   // Returns a new server nonce.
   std::string NewServerNonce(QuicRandom* rand, QuicWallTime now) const;
 
-  // Check if |nonce| is valid |now|.
-  HandshakeFailureReason ValidateServerNonce(base::StringPiece nonce,
-                                             QuicWallTime now);
-
-  // Returns the mutex needed to access the strike register client.
-  base::Lock* GetStrikeRegisterClientLock();
-
   // CheckConfigs compares the state of the Configs in |server_config_| to the
   // description given as arguments. The arguments are given as
   // nullptr-terminated std:pairs. The first of each std:pair is the server
@@ -98,10 +91,6 @@ class QuicCryptoServerConfigPeer {
 
   uint32_t source_address_token_lifetime_secs();
 
-  uint32_t server_nonce_strike_register_max_entries();
-
-  uint32_t server_nonce_strike_register_window_secs();
-
  private:
   const QuicCryptoServerConfig* server_config_;
 };