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

net/tools/quic/quic_simple_server_stream.h

Index: net/tools/quic/quic_simple_server_stream.h
diff --git a/net/tools/quic/quic_simple_server_stream.h b/net/tools/quic/quic_simple_server_stream.h
index fc23e3b267bf4aff3f221ae28e313c8d87c222bf..7cb1819c988a1cd58896b2156551b5e6778b5bca 100644
--- a/net/tools/quic/quic_simple_server_stream.h
+++ b/net/tools/quic/quic_simple_server_stream.h
@@ -10,10 +10,10 @@
 #include <string>
 
 #include "base/macros.h"
-#include "net/quic/core/quic_protocol.h"
+#include "net/quic/core/quic_packets.h"
 #include "net/quic/core/quic_spdy_stream.h"
 #include "net/spdy/spdy_framer.h"
-#include "net/tools/quic/quic_in_memory_cache.h"
+#include "net/tools/quic/quic_http_response_cache.h"
 
 namespace net {
 
@@ -28,7 +28,7 @@ class QuicSimpleServerStream : public QuicSpdyStream {
  public:
   QuicSimpleServerStream(QuicStreamId id,
                          QuicSpdySession* session,
-                         QuicInMemoryCache* in_memory_cache);
+                         QuicHttpResponseCache* response_cache);
   ~QuicSimpleServerStream() override;
 
   // QuicSpdyStream
@@ -83,7 +83,7 @@ class QuicSimpleServerStream : public QuicSpdyStream {
   int64_t content_length_;
   std::string body_;
 
-  QuicInMemoryCache* in_memory_cache_;  // Not owned.
+  QuicHttpResponseCache* response_cache_;  // Not owned.
 
   DISALLOW_COPY_AND_ASSIGN(QuicSimpleServerStream);
 };