Landing Recent QUIC changes until Sat Oct 29 14:59:35.

net/quic/test_tools/crypto_test_utils.h

Index: net/quic/test_tools/crypto_test_utils.h
diff --git a/net/quic/test_tools/crypto_test_utils.h b/net/quic/test_tools/crypto_test_utils.h
index c8a4edcc06b7a99813383f2ed37ecb9ffbee9a18..d1468dc38a61c261cd5da93f67f74fdf38856d39 100644
--- a/net/quic/test_tools/crypto_test_utils.h
+++ b/net/quic/test_tools/crypto_test_utils.h
@@ -100,12 +100,11 @@ class CryptoTestUtils {
                                      const QuicServerId& server_id,
                                      const FakeClientOptions& options);
 
-  // SetupCryptoServerConfigForTest configures |config| and |crypto_config|
+  // SetupCryptoServerConfigForTest configures |crypto_config|
   // with sensible defaults for testing.
   static void SetupCryptoServerConfigForTest(
       const QuicClock* clock,
       QuicRandom* rand,
-      QuicConfig* config,
       QuicCryptoServerConfig* crypto_config,
       const FakeServerOptions& options);