Landing recent QUIC changes until 6/24/2016 14:00 UTC

net/quic/test_tools/crypto_test_utils.h

 // Copyright (c) 2012 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_TEST_TOOLS_CRYPTO_TEST_UTILS_H_
 #define NET_QUIC_TEST_TOOLS_CRYPTO_TEST_UTILS_H_
 
 #include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 67 matching lines @@
     // If channel_id_source_async is true then the client will use an async
     // ChannelIDSource for testing. Ignored if channel_id_enabled is false.
     bool channel_id_source_async;
 
     // If token_binding_enabled is true, then the client will attempt to
     // negotiate Token Binding.
     bool token_binding_enabled;
   };
 
   // returns: the number of client hellos that the client sent.
-  static int HandshakeWithFakeServer(MockQuicConnectionHelper* helper,
+  static int HandshakeWithFakeServer(QuicConfig* server_quic_config,
+                                     MockQuicConnectionHelper* helper,
                                      MockAlarmFactory* alarm_factory,
                                      PacketSavingConnection* client_conn,
                                      QuicCryptoClientStream* client,
                                      const FakeServerOptions& options);
 
   // returns: the number of client hellos that the client sent.
   static int HandshakeWithFakeClient(MockQuicConnectionHelper* helper,
-
                                      MockAlarmFactory* alarm_factory,
-
                                      PacketSavingConnection* server_conn,
                                      QuicCryptoServerStream* server,
                                      const QuicServerId& server_id,
                                      const FakeClientOptions& options);
 
   // SetupCryptoServerConfigForTest configures |config| and |crypto_config|
   // with sensible defaults for testing.
   static void SetupCryptoServerConfigForTest(
       const QuicClock* clock,
       QuicRandom* rand,
@@ skipping 102 matching lines @@
                                          QuicCryptoServerStream* server);
 
   DISALLOW_COPY_AND_ASSIGN(CryptoTestUtils);
 };
 
 }  // namespace test
 
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_CRYPTO_TEST_UTILS_H_