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

components/cronet/android/test/quic_test_server.cc

Index: components/cronet/android/test/quic_test_server.cc
diff --git a/components/cronet/android/test/quic_test_server.cc b/components/cronet/android/test/quic_test_server.cc
index e704253a9ddd094e04d1c954d3c58c9095389da0..515b5edcddcabbaae76de25b58fbfaed7add8604 100644
--- a/components/cronet/android/test/quic_test_server.cc
+++ b/components/cronet/android/test/quic_test_server.cc
@@ -18,7 +18,7 @@
 #include "net/base/ip_endpoint.h"
 #include "net/quic/chromium/crypto/proof_source_chromium.h"
 #include "net/test/test_data_directory.h"
-#include "net/tools/quic/quic_in_memory_cache.h"
+#include "net/tools/quic/quic_http_response_cache.h"
 #include "net/tools/quic/quic_simple_server.h"
 
 using base::android::JavaParamRef;
@@ -31,7 +31,7 @@ namespace {
 static const int kServerPort = 6121;
 
 base::Thread* g_quic_server_thread = nullptr;
-net::QuicInMemoryCache* g_quic_in_memory_cache = nullptr;
+net::QuicHttpResponseCache* g_quic_response_cache = nullptr;
 net::QuicSimpleServer* g_quic_server = nullptr;
 
 void StartOnServerThread(const base::FilePath& test_files_root,
@@ -42,8 +42,8 @@ void StartOnServerThread(const base::FilePath& test_files_root,
   // Set up in-memory cache.
   base::FilePath file_dir = test_files_root.Append("quic_data");
   CHECK(base::PathExists(file_dir)) << "Quic data does not exist";
-  g_quic_in_memory_cache = new net::QuicInMemoryCache();
-  g_quic_in_memory_cache->InitializeFromDirectory(file_dir.value());
+  g_quic_response_cache = new net::QuicHttpResponseCache();
+  g_quic_response_cache->InitializeFromDirectory(file_dir.value());
   net::QuicConfig config;
 
   // Set up server certs.
@@ -57,7 +57,7 @@ void StartOnServerThread(const base::FilePath& test_files_root,
   g_quic_server = new net::QuicSimpleServer(
       std::move(proof_source), config,
       net::QuicCryptoServerConfig::ConfigOptions(), net::AllSupportedVersions(),
-      g_quic_in_memory_cache);
+      g_quic_response_cache);
 
   // Start listening.
   int rv = g_quic_server->Listen(
@@ -71,7 +71,7 @@ void ShutdownOnServerThread() {
   DCHECK(g_quic_server_thread->task_runner()->BelongsToCurrentThread());
   g_quic_server->Shutdown();
   delete g_quic_server;
-  delete g_quic_in_memory_cache;
+  delete g_quic_response_cache;
 }
 
 }  // namespace