Landing Recent QUIC changes until 2015-11-09 20:32 UTC

net/quic/quic_chromium_client_session_test.cc

 // 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.
 
 #include "net/quic/quic_chromium_client_session.h"
 
 #include <vector>
 
 #include "base/base64.h"
 #include "base/files/file_path.h"
@@ skipping 73 matching lines @@
   scoped_ptr<DatagramClientSocket> GetSocket() {
     socket_factory_.AddSocketDataProvider(&socket_data_);
     return socket_factory_.CreateDatagramClientSocket(
         DatagramSocket::DEFAULT_BIND, base::Bind(&base::RandInt), &net_log_,
         NetLog::Source());
   }
 
   void CompleteCryptoHandshake() {
     ASSERT_EQ(ERR_IO_PENDING,
               session_.CryptoConnect(false, callback_.callback()));
-    CryptoTestUtils::HandshakeWithFakeServer(&helper_, connection_,
-                                             session_.GetCryptoStream());
+    CryptoTestUtils::FakeServerOptions server_options;
+    CryptoTestUtils::HandshakeWithFakeServer(
+        &helper_, connection_, session_.GetCryptoStream(), server_options);
     ASSERT_EQ(OK, callback_.WaitForResult());
   }
 
   MockConnectionHelper helper_;
   QuicCryptoClientConfig crypto_config_;
   PacketSavingConnection* connection_;
   TestNetLog net_log_;
   MockClientSocketFactory socket_factory_;
   StaticSocketDataProvider socket_data_;
   TransportSecurityState transport_security_state_;
@@ skipping 159 matching lines @@
   session_.OnProofVerifyDetailsAvailable(details);
   QuicChromiumClientSessionPeer::SetHostname(&session_, "www.example.org");
   QuicChromiumClientSessionPeer::SetChannelIDSent(&session_, true);
 
   EXPECT_TRUE(session_.CanPool("mail.example.org", PRIVACY_MODE_DISABLED));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net