Land Recent QUIC Changes.

net/tools/quic/quic_server_session_test.cc

 // Copyright 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/tools/quic/quic_server_session.h"
 
 #include "net/quic/crypto/quic_crypto_server_config.h"
 #include "net/quic/crypto/quic_random.h"
 #include "net/quic/quic_connection.h"
 #include "net/quic/quic_utils.h"
@@ skipping 39 matching lines @@
     session()->MarkDecompressionBlocked(1, id());
     session()->CloseStream(id());
     return true;
   }
 
   virtual uint32 ProcessData(const char* data, uint32 data_len) OVERRIDE {
     return 0;
   }
 };
 
-class TestQuicQuicServerSession : public QuicServerSession {
+class TestQuicServerSession : public QuicServerSession {
  public:
-  TestQuicQuicServerSession(const QuicConfig& config,
+  TestQuicServerSession(const QuicConfig& config,
                             QuicConnection* connection,
                             QuicServerSessionVisitor* owner)
       : QuicServerSession(config, connection, owner),
         close_stream_on_data_(false) {}
 
   virtual QuicDataStream* CreateIncomingDataStream(
       QuicStreamId id) OVERRIDE {
     if (!ShouldCreateIncomingDataStream(id)) {
       return NULL;
     }
@@ skipping 17 matching lines @@
 class QuicServerSessionTest : public ::testing::TestWithParam<QuicVersion> {
  protected:
   QuicServerSessionTest()
       : crypto_config_(QuicCryptoServerConfig::TESTING,
                        QuicRandom::GetInstance()) {
     config_.SetDefaults();
     config_.set_max_streams_per_connection(3, 3);
 
     connection_ =
         new StrictMock<MockConnection>(true, SupportedVersions(GetParam()));
-    session_.reset(new TestQuicQuicServerSession(
+    session_.reset(new TestQuicServerSession(
         config_, connection_, &owner_));
     session_->InitializeSession(crypto_config_);
     visitor_ = QuicConnectionPeer::GetVisitor(connection_);
   }
 
   void MarkHeadersReadForStream(QuicStreamId id) {
     QuicDataStream* stream = QuicServerSessionPeer::GetDataStream(
         session_.get(), id);
     ASSERT_TRUE(stream != NULL);
     QuicDataStreamPeer::SetHeadersDecompressed(stream, true);
   }
 
   QuicVersion version() const { return connection_->version(); }
 
   StrictMock<MockQuicServerSessionVisitor> owner_;
   StrictMock<MockConnection>* connection_;
   QuicConfig config_;
   QuicCryptoServerConfig crypto_config_;
-  scoped_ptr<TestQuicQuicServerSession> session_;
+  scoped_ptr<TestQuicServerSession> session_;
   QuicConnectionVisitorInterface* visitor_;
 };
 
 INSTANTIATE_TEST_CASE_P(Tests, QuicServerSessionTest,
                         ::testing::ValuesIn(QuicSupportedVersions()));
 
 TEST_P(QuicServerSessionTest, CloseStreamDueToReset) {
   QuicStreamId stream_id = (version() == QUIC_VERSION_12 ? 3 : 5);
   // Open a stream, then reset it.
   // Send two bytes of payload to open it.
@@ skipping 135 matching lines @@
   // Incoming streams on the server session must be odd.
   EXPECT_CALL(*connection_, SendConnectionClose(QUIC_INVALID_STREAM_ID));
   EXPECT_EQ(NULL,
             QuicServerSessionPeer::GetIncomingDataStream(session_.get(), 4));
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace tools
 }  // namespace net