Landing Recent QUIC changes until Fri Nov 18 23:21:04 2016 +0000

net/quic/core/quic_server_session_base_test.cc

Index: net/quic/core/quic_server_session_base_test.cc
diff --git a/net/quic/core/quic_server_session_base_test.cc b/net/quic/core/quic_server_session_base_test.cc
index cf31496a5b6b33daea54596c4a592d203d793c38..5bcc10941c6d49e3cc1196e15a39c7902d46e450 100644
--- a/net/quic/core/quic_server_session_base_test.cc
+++ b/net/quic/core/quic_server_session_base_test.cc
@@ -84,14 +84,14 @@ class TestServerSession : public QuicServerSessionBase {
                     QuicCryptoServerStream::Helper* helper,
                     const QuicCryptoServerConfig* crypto_config,
                     QuicCompressedCertsCache* compressed_certs_cache,
-                    QuicInMemoryCache* in_memory_cache)
+                    QuicHttpResponseCache* response_cache)
       : QuicServerSessionBase(config,
                               connection,
                               visitor,
                               helper,
                               crypto_config,
                               compressed_certs_cache),
-        in_memory_cache_(in_memory_cache) {}
+        response_cache_(response_cache) {}
 
   ~TestServerSession() override { delete connection(); };
 
@@ -101,7 +101,7 @@ class TestServerSession : public QuicServerSessionBase {
       return nullptr;
     }
     QuicSpdyStream* stream =
-        new QuicSimpleServerStream(id, this, in_memory_cache_);
+        new QuicSimpleServerStream(id, this, response_cache_);
     ActivateStream(base::WrapUnique(stream));
     return stream;
   }
@@ -112,7 +112,7 @@ class TestServerSession : public QuicServerSessionBase {
     }
 
     QuicSpdyStream* stream = new QuicSimpleServerStream(
-        GetNextOutgoingStreamId(), this, in_memory_cache_);
+        GetNextOutgoingStreamId(), this, response_cache_);
     stream->SetPriority(priority);
     ActivateStream(base::WrapUnique(stream));
     return stream;
@@ -127,7 +127,7 @@ class TestServerSession : public QuicServerSessionBase {
   }
 
  private:
-  QuicInMemoryCache* in_memory_cache_;  // Owned by QuicServerSessionBaseTest.
+  QuicHttpResponseCache* response_cache_;  // Owned by QuicServerSessionBaseTest
 };
 
 const size_t kMaxStreamsForTest = 10;
@@ -157,7 +157,7 @@ class QuicServerSessionBaseTest : public ::testing::TestWithParam<QuicVersion> {
         SupportedVersions(GetParam()));
     session_.reset(new TestServerSession(
         config_, connection_, &owner_, &stream_helper_, &crypto_config_,
-        &compressed_certs_cache_, &in_memory_cache_));
+        &compressed_certs_cache_, &response_cache_));
     MockClock clock;
     handshake_message_.reset(crypto_config_.AddDefaultConfig(
         QuicRandom::GetInstance(), &clock,
@@ -174,7 +174,7 @@ class QuicServerSessionBaseTest : public ::testing::TestWithParam<QuicVersion> {
   QuicConfig config_;
   QuicCryptoServerConfig crypto_config_;
   QuicCompressedCertsCache compressed_certs_cache_;
-  QuicInMemoryCache in_memory_cache_;
+  QuicHttpResponseCache response_cache_;
   std::unique_ptr<TestServerSession> session_;
   std::unique_ptr<CryptoHandshakeMessage> handshake_message_;
   QuicConnectionVisitorInterface* visitor_;