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

net/tools/quic/quic_simple_server_test.cc

Index: net/tools/quic/quic_simple_server_test.cc
diff --git a/net/tools/quic/quic_simple_server_test.cc b/net/tools/quic/quic_simple_server_test.cc
index 991bb9851e1efda82f5a0f7470ec71a5fd6b5675..adac378c5e456557d9e5aa96fe14d1bcdd377441 100644
--- a/net/tools/quic/quic_simple_server_test.cc
+++ b/net/tools/quic/quic_simple_server_test.cc
@@ -36,7 +36,7 @@ class QuicChromeServerDispatchPacketTest : public ::testing::Test {
             std::unique_ptr<QuicCryptoServerStream::Helper>(
                 new QuicSimpleServerSessionHelper(QuicRandom::GetInstance())),
             std::unique_ptr<MockAlarmFactory>(new net::test::MockAlarmFactory),
-            &in_memory_cache_) {
+            &response_cache_) {
     dispatcher_.InitializeWithWriter(nullptr);
   }
 
@@ -52,7 +52,7 @@ class QuicChromeServerDispatchPacketTest : public ::testing::Test {
   QuicCryptoServerConfig crypto_config_;
   QuicVersionManager version_manager_;
   net::test::MockQuicDispatcher dispatcher_;
-  QuicInMemoryCache in_memory_cache_;
+  QuicHttpResponseCache response_cache_;
 };
 
 TEST_F(QuicChromeServerDispatchPacketTest, DispatchPacket) {