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

net/url_request/url_request_quic_unittest.cc

Index: net/url_request/url_request_quic_unittest.cc
diff --git a/net/url_request/url_request_quic_unittest.cc b/net/url_request/url_request_quic_unittest.cc
index 9788128a4987102489b5b0d33baa54d4110c856f..c285100d10dd0812b152de902d3d99431cc32f2b 100644
--- a/net/url_request/url_request_quic_unittest.cc
+++ b/net/url_request/url_request_quic_unittest.cc
@@ -20,7 +20,7 @@
 #include "net/test/cert_test_util.h"
 #include "net/test/gtest_util.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"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_util.h"
@@ -92,8 +92,8 @@ class URLRequestQuicTest : public ::testing::Test {
  private:
   void StartQuicServer() {
     // Set up in-memory cache.
-    in_memory_cache_.AddSimpleResponse(kTestServerHost, kHelloPath,
-                                       kHelloStatus, kHelloBodyValue);
+    response_cache_.AddSimpleResponse(kTestServerHost, kHelloPath, kHelloStatus,
+                                      kHelloBodyValue);
     net::QuicConfig config;
     // Set up server certs.
     std::unique_ptr<net::ProofSourceChromium> proof_source(
@@ -106,7 +106,7 @@ class URLRequestQuicTest : public ::testing::Test {
     server_.reset(new QuicSimpleServer(
         test::CryptoTestUtils::ProofSourceForTesting(), config,
         net::QuicCryptoServerConfig::ConfigOptions(), AllSupportedVersions(),
-        &in_memory_cache_));
+        &response_cache_));
     int rv = server_->Listen(
         net::IPEndPoint(net::IPAddress::IPv4AllZeros(), kTestServerPort));
     EXPECT_GE(rv, 0) << "Quic server fails to start";
@@ -124,7 +124,7 @@ class URLRequestQuicTest : public ::testing::Test {
   std::unique_ptr<MappedHostResolver> host_resolver_;
   std::unique_ptr<QuicSimpleServer> server_;
   std::unique_ptr<TestURLRequestContext> context_;
-  QuicInMemoryCache in_memory_cache_;
+  QuicHttpResponseCache response_cache_;
   MockCertVerifier cert_verifier_;
 };