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/test_tools/quic_connection_peer.h"
@@ skipping 42 matching lines @@
 
   virtual uint32 ProcessData(const char* data, uint32 data_len) OVERRIDE {
     return 0;
   }
 };
 
 class TestQuicQuicServerSession : public QuicServerSession {
  public:
   TestQuicQuicServerSession(const QuicConfig& config,
                             QuicConnection* connection,
-                            QuicSessionOwner* owner)
+                            QuicServerSessionVisitor* owner)
       : QuicServerSession(config, connection, owner),
-        close_stream_on_data_(false) {
-  }
+        close_stream_on_data_(false) {}
 
   virtual QuicDataStream* CreateIncomingDataStream(
       QuicStreamId id) OVERRIDE {
     if (!ShouldCreateIncomingDataStream(id)) {
       return NULL;
     }
     if (close_stream_on_data_) {
       return new CloseOnDataStream(id, this);
     } else {
       return new QuicSpdyServerStream(id, this);
@@ skipping 26 matching lines @@
     visitor_ = QuicConnectionPeer::GetVisitor(connection_);
   }
 
   void MarkHeadersReadForStream(QuicStreamId id) {
     QuicDataStream* stream = QuicServerSessionPeer::GetDataStream(
         session_.get(), id);
     ASSERT_TRUE(stream != NULL);
     QuicDataStreamPeer::SetHeadersDecompressed(stream, true);
   }
 
-  StrictMock<MockQuicSessionOwner> owner_;
+  StrictMock<MockQuicServerSessionVisitor> owner_;
   StrictMock<MockConnection>* connection_;
   QuicConfig config_;
   QuicCryptoServerConfig crypto_config_;
   scoped_ptr<TestQuicQuicServerSession> session_;
   QuicConnectionVisitorInterface* visitor_;
 };
 
 INSTANTIATE_TEST_CASE_P(Tests, QuicServerSessionTest,
                         ::testing::ValuesIn(QuicSupportedVersions()));
 
@@ skipping 126 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