Landing Recent QUIC changes until 01/31/2016 05:22 UTC

net/quic/test_tools/mock_crypto_client_stream.cc

Index: net/quic/test_tools/mock_crypto_client_stream.cc
diff --git a/net/quic/test_tools/mock_crypto_client_stream.cc b/net/quic/test_tools/mock_crypto_client_stream.cc
index b0db4dd05d372f5e64bc49ef4aef1aecc6dd8598..580beb61a9d87fa91684e1bfe301b0142d65ae3c 100644
--- a/net/quic/test_tools/mock_crypto_client_stream.cc
+++ b/net/quic/test_tools/mock_crypto_client_stream.cc
@@ -21,7 +21,11 @@ MockCryptoClientStream::MockCryptoClientStream(
     QuicCryptoClientConfig* crypto_config,
     HandshakeMode handshake_mode,
     const ProofVerifyDetails* proof_verify_details)
-    : QuicCryptoClientStream(server_id, session, verify_context, crypto_config),
+    : QuicCryptoClientStream(server_id,
+                             session,
+                             verify_context,
+                             crypto_config,
+                             session),
       handshake_mode_(handshake_mode),
       proof_verify_details_(proof_verify_details) {}
 
@@ -41,7 +45,8 @@ void MockCryptoClientStream::CryptoConnect() {
       crypto_negotiated_params_.key_exchange = kC255;
       crypto_negotiated_params_.aead = kAESG;
       if (proof_verify_details_) {
-        client_session()->OnProofVerifyDetailsAvailable(*proof_verify_details_);
+        reinterpret_cast<QuicClientSessionBase*>(session())
+            ->OnProofVerifyDetailsAvailable(*proof_verify_details_);
       }
       session()->connection()->SetDecrypter(ENCRYPTION_INITIAL,
                                             QuicDecrypter::Create(kNULL));
@@ -59,7 +64,8 @@ void MockCryptoClientStream::CryptoConnect() {
       crypto_negotiated_params_.key_exchange = kC255;
       crypto_negotiated_params_.aead = kAESG;
       if (proof_verify_details_) {
-        client_session()->OnProofVerifyDetailsAvailable(*proof_verify_details_);
+        reinterpret_cast<QuicClientSessionBase*>(session())
+            ->OnProofVerifyDetailsAvailable(*proof_verify_details_);
       }
       SetConfigNegotiated();
       session()->connection()->SetDecrypter(ENCRYPTION_FORWARD_SECURE,
@@ -116,8 +122,4 @@ void MockCryptoClientStream::SetConfigNegotiated() {
   session()->OnConfigNegotiated();
 }
 
-QuicClientSessionBase* MockCryptoClientStream::client_session() {
-  return reinterpret_cast<QuicClientSessionBase*>(session());
-}
-
 }  // namespace net