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

net/tools/quic/quic_server_bin.cc

 // 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 binary wrapper for QuicServer.  It listens forever on --port
 // (default 6121) until it's killed or ctrl-cd to death.
 
 #include <iostream>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "net/quic/chromium/crypto/proof_source_chromium.h"
-#include "net/quic/core/quic_protocol.h"
+#include "net/quic/core/quic_packets.h"
 #include "net/quic/platform/api/quic_socket_address.h"
-#include "net/tools/quic/quic_in_memory_cache.h"
+#include "net/tools/quic/quic_http_response_cache.h"
 #include "net/tools/quic/quic_server.h"
 
 // The port the quic server will listen on.
 int32_t FLAGS_port = 6121;
 
 std::unique_ptr<net::ProofSource> CreateProofSource(
     const base::FilePath& cert_path,
     const base::FilePath& key_path) {
   std::unique_ptr<net::ProofSourceChromium> proof_source(
       new net::ProofSourceChromium());
@@ skipping 12 matching lines @@
   settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
   CHECK(logging::InitLogging(settings));
 
   if (line->HasSwitch("h") || line->HasSwitch("help")) {
     const char* help_str =
         "Usage: quic_server [options]\n"
         "\n"
         "Options:\n"
         "-h, --help                  show this help message and exit\n"
         "--port=<port>               specify the port to listen on\n"
-        "--quic_in_memory_cache_dir  directory containing response data\n"
+        "--quic_response_cache_dir  directory containing response data\n"
         "                            to load\n"
         "--certificate_file=<file>   path to the certificate chain\n"
         "--key_file=<file>           path to the pkcs8 private key\n";
     std::cout << help_str;
     exit(0);
   }
 
-  net::QuicInMemoryCache in_memory_cache;
-  if (line->HasSwitch("quic_in_memory_cache_dir")) {
-    in_memory_cache.InitializeFromDirectory(
-        line->GetSwitchValueASCII("quic_in_memory_cache_dir"));
+  net::QuicHttpResponseCache response_cache;
+  if (line->HasSwitch("quic_response_cache_dir")) {
+    response_cache.InitializeFromDirectory(
+        line->GetSwitchValueASCII("quic_response_cache_dir"));
   }
 
   if (line->HasSwitch("port")) {
     if (!base::StringToInt(line->GetSwitchValueASCII("port"), &FLAGS_port)) {
       LOG(ERROR) << "--port must be an integer\n";
       return 1;
     }
   }
 
   if (!line->HasSwitch("certificate_file")) {
     LOG(ERROR) << "missing --certificate_file";
     return 1;
   }
 
   if (!line->HasSwitch("key_file")) {
     LOG(ERROR) << "missing --key_file";
     return 1;
   }
 
   net::QuicConfig config;
   net::QuicServer server(
       CreateProofSource(line->GetSwitchValuePath("certificate_file"),
                         line->GetSwitchValuePath("key_file")),
       config, net::QuicCryptoServerConfig::ConfigOptions(),
-      net::AllSupportedVersions(), &in_memory_cache);
+      net::AllSupportedVersions(), &response_cache);
 
   int rc = server.CreateUDPSocketAndListen(
       net::QuicSocketAddress(net::QuicIpAddress::Any6(), FLAGS_port));
   if (rc < 0) {
     return 1;
   }
 
   while (1) {
     server.WaitForEvents();
   }
 }