Index: net/quic/core/quic_crypto_client_stream_test.cc |
diff --git a/net/quic/core/quic_crypto_client_stream_test.cc b/net/quic/core/quic_crypto_client_stream_test.cc |
index d69c7c96d80e57448aa8f47e657be8b277f44f6b..d1174574b402ee656cbece80e0f8334c79f605c5 100644 |
--- a/net/quic/core/quic_crypto_client_stream_test.cc |
+++ b/net/quic/core/quic_crypto_client_stream_test.cc |
@@ -9,10 +9,10 @@ |
#include "net/quic/core/crypto/aes_128_gcm_12_encrypter.h" |
#include "net/quic/core/crypto/quic_decrypter.h" |
#include "net/quic/core/crypto/quic_encrypter.h" |
-#include "net/quic/core/quic_flags.h" |
#include "net/quic/core/quic_packets.h" |
#include "net/quic/core/quic_server_id.h" |
#include "net/quic/core/quic_utils.h" |
+#include "net/quic/platform/api/quic_flags.h" |
#include "net/quic/test_tools/crypto_test_utils.h" |
#include "net/quic/test_tools/quic_stream_peer.h" |
#include "net/quic/test_tools/quic_stream_sequencer_peer.h" |
@@ -64,7 +64,9 @@ class QuicCryptoClientStreamTest : public ::testing::Test { |
framer.ConstructHandshakeMessage(message_, perspective)); |
} |
- QuicCryptoClientStream* stream() { return session_->GetCryptoStream(); } |
+ QuicCryptoClientStream* stream() { |
+ return session_->GetMutableCryptoStream(); |
+ } |
MockQuicConnectionHelper server_helper_; |
MockQuicConnectionHelper client_helper_; |
@@ -372,14 +374,14 @@ class QuicCryptoClientStreamStatelessTest : public ::testing::Test { |
} |
QuicCryptoServerStream* server_stream() { |
- return server_session_->GetCryptoStream(); |
+ return server_session_->GetMutableCryptoStream(); |
} |
void AdvanceHandshakeWithFakeServer() { |
- client_session_->GetCryptoStream()->CryptoConnect(); |
- crypto_test_utils::AdvanceHandshake(client_connection_, |
- client_session_->GetCryptoStream(), 0, |
- server_connection_, server_stream(), 0); |
+ client_session_->GetMutableCryptoStream()->CryptoConnect(); |
+ crypto_test_utils::AdvanceHandshake( |
+ client_connection_, client_session_->GetMutableCryptoStream(), 0, |
+ server_connection_, server_stream(), 0); |
} |
// Initializes the server_stream_ for stateless rejects. |
@@ -432,8 +434,8 @@ TEST_F(QuicCryptoClientStreamStatelessTest, StatelessReject) { |
EXPECT_EQ(1, server_stream()->NumHandshakeMessages()); |
EXPECT_EQ(0, server_stream()->NumHandshakeMessagesWithServerNonces()); |
- EXPECT_FALSE(client_session_->GetCryptoStream()->encryption_established()); |
- EXPECT_FALSE(client_session_->GetCryptoStream()->handshake_confirmed()); |
+ EXPECT_FALSE(client_session_->IsEncryptionEstablished()); |
+ EXPECT_FALSE(client_session_->IsCryptoHandshakeConfirmed()); |
// Even though the handshake was not complete, the cached client_state is |
// complete, and can be used for a subsequent successful handshake. |
EXPECT_TRUE(client_state->IsComplete(QuicWallTime::FromUNIXSeconds(0))); |