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 2673148f76cd32d17527fe64c4aebd348c976069..1b2cb3f7ce6bf91396a0ef7eb21f100dec09bf15 100644
--- a/net/tools/quic/quic_server_session_test.cc
+++ b/net/tools/quic/quic_server_session_test.cc
@@ -60,10 +60,9 @@ 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 {
@@ -110,7 +109,7 @@ class QuicServerSessionTest : public ::testing::TestWithParam<QuicVersion> {
     QuicDataStreamPeer::SetHeadersDecompressed(stream, true);
   }
 
-  StrictMock<MockQuicSessionOwner> owner_;
+  StrictMock<MockQuicServerSessionVisitor> owner_;
   StrictMock<MockConnection>* connection_;
   QuicConfig config_;
   QuicCryptoServerConfig crypto_config_;