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

net/tools/quic/quic_simple_server.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // A toy server, which listens on a specified address for QUIC traffic and
 // handles incoming responses.
 
 #ifndef NET_QUIC_TOOLS_QUIC_SIMPLE_SERVER_H_
 #define NET_QUIC_TOOLS_QUIC_SIMPLE_SERVER_H_
 
 #include <memory>
 
 #include "base/macros.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
 #include "net/log/net_log.h"
 #include "net/quic/chromium/quic_chromium_alarm_factory.h"
 #include "net/quic/chromium/quic_chromium_connection_helper.h"
 #include "net/quic/core/crypto/quic_crypto_server_config.h"
 #include "net/quic/core/quic_clock.h"
 #include "net/quic/core/quic_config.h"
-#include "net/tools/quic/quic_in_memory_cache.h"
+#include "net/quic/core/quic_version_manager.h"
+#include "net/tools/quic/quic_http_response_cache.h"
 
 namespace net {
 
 class UDPServerSocket;
 
 
 class QuicDispatcher;
 
 namespace test {
 class QuicSimpleServerPeer;
 }  // namespace test
 
 class QuicSimpleServer {
  public:
   QuicSimpleServer(
       std::unique_ptr<ProofSource> proof_source,
       const QuicConfig& config,
       const QuicCryptoServerConfig::ConfigOptions& crypto_config_options,
       const QuicVersionVector& supported_versions,
-      QuicInMemoryCache* in_memory_cache);
+      QuicHttpResponseCache* response_cache);
 
   virtual ~QuicSimpleServer();
 
   // Start listening on the specified address. Returns an error code.
   int Listen(const IPEndPoint& address);
 
   // Server deletion is imminent. Start cleaning up.
   void Shutdown();
 
   // Start reading on the socket. On asynchronous reads, this registers
@@ skipping 53 matching lines @@
 
   // The target buffer of the current read.
   scoped_refptr<IOBufferWithSize> read_buffer_;
 
   // The source address of the current read.
   IPEndPoint client_address_;
 
   // The log to use for the socket.
   NetLog net_log_;
 
-  QuicInMemoryCache* in_memory_cache_;
+  QuicHttpResponseCache* response_cache_;
 
   base::WeakPtrFactory<QuicSimpleServer> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicSimpleServer);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_TOOLS_QUIC_SIMPLE_SERVER_H_