Pass QuicInMemoryCache directly instead of using a singleton.

net/tools/quic/quic_simple_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"
@@ skipping 39 matching lines @@
         "-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"
         "                            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")) {
-    net::QuicInMemoryCache::GetInstance()->InitializeFromDirectory(
+    in_memory_cache.InitializeFromDirectory(
         line->GetSwitchValueASCII("quic_in_memory_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::IPAddress ip = net::IPAddress::IPv6AllZeros();
 
   net::QuicConfig config;
   net::QuicSimpleServer server(
       CreateProofSource(line->GetSwitchValuePath("certificate_file"),
                         line->GetSwitchValuePath("key_file")),
       config, net::QuicCryptoServerConfig::ConfigOptions(),
-      net::AllSupportedVersions());
+      net::AllSupportedVersions(), &in_memory_cache);
 
   int rc = server.Listen(net::IPEndPoint(ip, FLAGS_port));
   if (rc < 0) {
     return 1;
   }
 
   base::RunLoop().Run();
 
   return 0;
 }