Land Recent QUIC changes.

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 <vector>
 
 #include "base/logging.h"
@@ skipping 14 matching lines @@
 class QuicCryptoServerStream;
 class QuicCryptoStream;
 class QuicRandom;
 
 namespace test {
 
 class PacketSavingConnection;
 
 class CryptoTestUtils {
  public:
+  // FakeClientOptions bundles together a number of options for configuring
+  // HandshakeWithFakeClient.
+  struct FakeClientOptions {
+    FakeClientOptions();
+
+    // If dont_verify_certs is true then no ProofVerifier is set on the client.
+    // Thus no certificates will be requested or checked.
+    bool dont_verify_certs;
+  };
+
   // returns: the number of client hellos that the client sent.
   static int HandshakeWithFakeServer(PacketSavingConnection* client_conn,
                                      QuicCryptoClientStream* client);
 
   // returns: the number of client hellos that the client sent.
   static int HandshakeWithFakeClient(PacketSavingConnection* server_conn,
-                                     QuicCryptoServerStream* server);
+                                     QuicCryptoServerStream* server,
+                                     const FakeClientOptions& options);
 
   // SetupCryptoServerConfigForTest configures |config| and |crypto_config|
   // with sensible defaults for testing.
   static void SetupCryptoServerConfigForTest(
       const QuicClock* clock,
       QuicRandom* rand,
       QuicConfig* config,
       QuicCryptoServerConfig* crypto_config);
 
   // CommunicateHandshakeMessages moves messages from |a| to |b| and back until
@@ skipping 22 matching lines @@
  private:
   static void CompareClientAndServerKeys(QuicCryptoClientStream* client,
                                          QuicCryptoServerStream* server);
 };
 
 }  // namespace test
 
 }  // namespace net
 
 #endif  // NET_QUIC_TEST_TOOLS_CRYPTO_TEST_UTILS_H_