Revert of Close the QUIC connection when non-crypto stream data is written at ENCRYPTION_NONE. Flag protected…

net/quic/test_tools/mock_crypto_client_stream.cc

 // Copyright (c) 2013 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/test_tools/mock_crypto_client_stream.h"
 
 #include "net/quic/crypto/quic_decrypter.h"
-#include "net/quic/crypto/quic_encrypter.h"
 #include "net/quic/quic_client_session_base.h"
 #include "net/quic/quic_server_id.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using std::string;
 
 namespace net {
 
 MockCryptoClientStream::MockCryptoClientStream(
     const QuicServerId& server_id,
@@ skipping 15 matching lines @@
   CloseConnection(QUIC_CRYPTO_MESSAGE_AFTER_HANDSHAKE_COMPLETE);
 }
 
 void MockCryptoClientStream::CryptoConnect() {
   switch (handshake_mode_) {
     case ZERO_RTT: {
       encryption_established_ = true;
       handshake_confirmed_ = false;
       session()->connection()->SetDecrypter(ENCRYPTION_INITIAL,
                                             QuicDecrypter::Create(kNULL));
-      session()->connection()->SetEncrypter(ENCRYPTION_INITIAL,
-                                            QuicEncrypter::Create(kNULL));
-      session()->connection()->SetDefaultEncryptionLevel(ENCRYPTION_INITIAL);
       session()->OnCryptoHandshakeEvent(
           QuicSession::ENCRYPTION_FIRST_ESTABLISHED);
       break;
     }
 
     case CONFIRM_HANDSHAKE: {
       encryption_established_ = true;
       handshake_confirmed_ = true;
       crypto_negotiated_params_.key_exchange = kC255;
       crypto_negotiated_params_.aead = kAESG;
       if (proof_verify_details_) {
         client_session()->OnProofVerifyDetailsAvailable(*proof_verify_details_);
       }
       SetConfigNegotiated();
       session()->connection()->SetDecrypter(ENCRYPTION_FORWARD_SECURE,
                                             QuicDecrypter::Create(kNULL));
-      session()->connection()->SetEncrypter(ENCRYPTION_FORWARD_SECURE,
-                                            QuicEncrypter::Create(kNULL));
-      session()->connection()->SetDefaultEncryptionLevel(
-          ENCRYPTION_FORWARD_SECURE);
       session()->OnCryptoHandshakeEvent(QuicSession::HANDSHAKE_CONFIRMED);
       break;
     }
 
     case COLD_START: {
       handshake_confirmed_ = false;
       encryption_established_ = false;
       break;
     }
   }
@@ skipping 33 matching lines @@
   ASSERT_EQ(QUIC_NO_ERROR, error);
   ASSERT_TRUE(session()->config()->negotiated());
   session()->OnConfigNegotiated();
 }
 
 QuicClientSessionBase* MockCryptoClientStream::client_session() {
   return reinterpret_cast<QuicClientSessionBase*>(session());
 }
 
 }  // namespace net