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

net/tools/quic/quic_simple_dispatcher.h

Index: net/tools/quic/quic_simple_dispatcher.h
diff --git a/net/tools/quic/quic_simple_dispatcher.h b/net/tools/quic/quic_simple_dispatcher.h
index 3f4ef135d35f400fdea1501c14e8bb4e80d2f763..b9df6d9c63cb92b82c793313f04109527b488cbb 100644
--- a/net/tools/quic/quic_simple_dispatcher.h
+++ b/net/tools/quic/quic_simple_dispatcher.h
@@ -7,7 +7,7 @@
 
 #include "net/quic/core/quic_server_session_base.h"
 #include "net/tools/quic/quic_dispatcher.h"
-#include "net/tools/quic/quic_in_memory_cache.h"
+#include "net/tools/quic/quic_http_response_cache.h"
 
 namespace net {
 
@@ -20,7 +20,7 @@ class QuicSimpleDispatcher : public QuicDispatcher {
       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);
 
   ~QuicSimpleDispatcher() override;
 
@@ -29,10 +29,10 @@ class QuicSimpleDispatcher : public QuicDispatcher {
       QuicConnectionId connection_id,
       const QuicSocketAddress& client_address) override;
 
-  QuicInMemoryCache* in_memory_cache() { return in_memory_cache_; }
+  QuicHttpResponseCache* response_cache() { return response_cache_; }
 
  private:
-  QuicInMemoryCache* in_memory_cache_;  // Unowned.
+  QuicHttpResponseCache* response_cache_;  // Unowned.
 };
 
 }  // namespace net