Land Recent QUIC changes

net/quic/quic_crypto_client_stream_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_crypto_client_stream.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "net/quic/crypto/aes_128_gcm_encrypter.h"
 #include "net/quic/crypto/quic_decrypter.h"
 #include "net/quic/crypto/quic_encrypter.h"
@@ skipping 27 matching lines @@
   }
   QuicStreamFrame* frame() { return &frame_; }
 
  private:
   QuicStreamFrame frame_;
   bool frame_valid_;
 
   DISALLOW_COPY_AND_ASSIGN(TestQuicVisitor);
 };
 
-// The same as MockSession, except that WriteData() is not mocked.
-class TestMockSession : public MockSession {
- public:
-  TestMockSession(QuicConnection* connection, bool is_server)
-      : MockSession(connection, is_server) {
-  }
-  virtual ~TestMockSession() {}
-
-  virtual QuicConsumedData WriteData(QuicStreamId id,
-                                     base::StringPiece data,
-                                     QuicStreamOffset offset,
-                                     bool fin) OVERRIDE {
-    return QuicSession::WriteData(id, data, offset, fin);
-  }
-};
-
 class QuicCryptoClientStreamTest : public ::testing::Test {
  public:
   QuicCryptoClientStreamTest()
       : addr_(),
         connection_(new PacketSavingConnection(1, addr_, true)),
         session_(connection_, true),
         stream_(kServerHostname, config_, &session_, &crypto_config_) {
+    session_.SetCryptoStream(&stream_);
     config_.SetDefaults();
     crypto_config_.SetDefaults();
   }
 
   void CompleteCryptoHandshake() {
     EXPECT_TRUE(stream_.CryptoConnect());
     CryptoTestUtils::HandshakeWithFakeServer(connection_, &stream_);
   }
 
   void ConstructHandshakeMessage() {
     CryptoFramer framer;
     message_data_.reset(framer.ConstructHandshakeMessage(message_));
   }
 
   IPEndPoint addr_;
   PacketSavingConnection* connection_;
-  TestMockSession session_;
+  TestSession session_;
   QuicCryptoClientStream stream_;
   CryptoHandshakeMessage message_;
   scoped_ptr<QuicData> message_data_;
   QuicConfig config_;
   QuicCryptoClientConfig crypto_config_;
 };
 
 TEST_F(QuicCryptoClientStreamTest, NotInitiallyConected) {
   if (!Aes128GcmEncrypter::IsSupported()) {
     LOG(INFO) << "AES GCM not supported. Test skipped.";
@@ skipping 61 matching lines @@
 
   const QuicCryptoNegotiatedParameters& crypto_params(
       stream_.crypto_negotiated_params());
   EXPECT_EQ(kAESG, crypto_params.aead);
   EXPECT_EQ(kC255, crypto_params.key_exchange);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net