Land Recent QUIC Changes.

net/tools/quic/quic_server_session_test.cc

Index: net/tools/quic/quic_server_session_test.cc
diff --git a/net/tools/quic/quic_server_session_test.cc b/net/tools/quic/quic_server_session_test.cc
index b8e6d5659a5795e6193371f5972bc87e9e5ab933..9bbf6f5dff94eb8dc9bb2203fdbef908f23dca3b 100644
--- a/net/tools/quic/quic_server_session_test.cc
+++ b/net/tools/quic/quic_server_session_test.cc
@@ -57,9 +57,9 @@ class CloseOnDataStream : public QuicDataStream {
   }
 };
 
-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),
@@ -97,7 +97,7 @@ class QuicServerSessionTest : public ::testing::TestWithParam<QuicVersion> {
 
     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_);
@@ -116,7 +116,7 @@ class QuicServerSessionTest : public ::testing::TestWithParam<QuicVersion> {
   StrictMock<MockConnection>* connection_;
   QuicConfig config_;
   QuicCryptoServerConfig crypto_config_;
-  scoped_ptr<TestQuicQuicServerSession> session_;
+  scoped_ptr<TestQuicServerSession> session_;
   QuicConnectionVisitorInterface* visitor_;
 };