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

net/tools/quic/quic_simple_dispatcher.cc

Index: net/tools/quic/quic_simple_dispatcher.cc
diff --git a/net/tools/quic/quic_simple_dispatcher.cc b/net/tools/quic/quic_simple_dispatcher.cc
index 4035769b38c7c821a2fbc09b8baca947c2fede76..cab2925d5f1c02a9d9b1985e1e77364a8a3b447f 100644
--- a/net/tools/quic/quic_simple_dispatcher.cc
+++ b/net/tools/quic/quic_simple_dispatcher.cc
@@ -15,14 +15,14 @@ QuicSimpleDispatcher::QuicSimpleDispatcher(
     std::unique_ptr<QuicConnectionHelperInterface> helper,
     std::unique_ptr<QuicCryptoServerStream::Helper> session_helper,
     std::unique_ptr<QuicAlarmFactory> alarm_factory,
-    QuicInMemoryCache* in_memory_cache)
+    QuicHttpResponseCache* response_cache)
     : QuicDispatcher(config,
                      crypto_config,
                      version_manager,
                      std::move(helper),
                      std::move(session_helper),
                      std::move(alarm_factory)),
-      in_memory_cache_(in_memory_cache) {}
+      response_cache_(response_cache) {}
 
 QuicSimpleDispatcher::~QuicSimpleDispatcher() {}
 
@@ -37,7 +37,7 @@ QuicServerSessionBase* QuicSimpleDispatcher::CreateQuicSession(
 
   QuicServerSessionBase* session = new QuicSimpleServerSession(
       config(), connection, this, session_helper(), crypto_config(),
-      compressed_certs_cache(), in_memory_cache_);
+      compressed_certs_cache(), response_cache_);
   session->Initialize();
   return session;
 }