| Index: net/quic/quic_crypto_client_stream.cc
|
| diff --git a/net/quic/quic_crypto_client_stream.cc b/net/quic/quic_crypto_client_stream.cc
|
| index 056ef7d4a1f0e9f017d74781281db80d44096056..1fe0b5c5dd27e7f4b03948ff48a28f46d254fd3d 100644
|
| --- a/net/quic/quic_crypto_client_stream.cc
|
| +++ b/net/quic/quic_crypto_client_stream.cc
|
| @@ -390,20 +390,10 @@ void QuicCryptoClientStream::DoSendCHLO(
|
| crypto_negotiated_params_.initial_crypters.encrypter.release());
|
| session()->connection()->SetDefaultEncryptionLevel(ENCRYPTION_INITIAL);
|
|
|
| - if (FLAGS_quic_reply_to_rej) {
|
| - // TODO(ianswett): Merge ENCRYPTION_REESTABLISHED and
|
| - // ENCRYPTION_FIRST_ESTABLSIHED.
|
| - encryption_established_ = true;
|
| - session()->OnCryptoHandshakeEvent(QuicSession::ENCRYPTION_REESTABLISHED);
|
| - } else {
|
| - if (!encryption_established_) {
|
| - encryption_established_ = true;
|
| - session()->OnCryptoHandshakeEvent(
|
| - QuicSession::ENCRYPTION_FIRST_ESTABLISHED);
|
| - } else {
|
| - session()->OnCryptoHandshakeEvent(QuicSession::ENCRYPTION_REESTABLISHED);
|
| - }
|
| - }
|
| + // TODO(ianswett): Merge ENCRYPTION_REESTABLISHED and
|
| + // ENCRYPTION_FIRST_ESTABLSIHED
|
| + encryption_established_ = true;
|
| + session()->OnCryptoHandshakeEvent(QuicSession::ENCRYPTION_REESTABLISHED);
|
| }
|
|
|
| void QuicCryptoClientStream::DoReceiveREJ(
|
|
|