Pass QuicInMemoryCache directly instead of using a singleton.

net/tools/quic/test_tools/quic_test_server.h

Index: net/tools/quic/test_tools/quic_test_server.h
diff --git a/net/tools/quic/test_tools/quic_test_server.h b/net/tools/quic/test_tools/quic_test_server.h
index 806b5e2375cac7e881dd397e1c5412e54ee207e1..3fbce5f6f852aa6dc0157184d163143fb589f475 100644
--- a/net/tools/quic/test_tools/quic_test_server.h
+++ b/net/tools/quic/test_tools/quic_test_server.h
@@ -37,7 +37,8 @@ class QuicTestServer : public QuicServer {
         QuicSession::Visitor* visitor,
         QuicCryptoServerStream::Helper* helper,
         const QuicCryptoServerConfig* crypto_config,
-        QuicCompressedCertsCache* compressed_certs_cache) = 0;
+        QuicCompressedCertsCache* compressed_certs_cache,
+        QuicInMemoryCache* in_memory_cache) = 0;
   };
 
   // Factory for creating QuicSimpleServerStreams.
@@ -46,8 +47,10 @@ class QuicTestServer : public QuicServer {
     virtual ~StreamFactory() {}
 
     // Returns a new stream owned by the caller.
-    virtual QuicSimpleServerStream* CreateStream(QuicStreamId id,
-                                                 QuicSpdySession* session) = 0;
+    virtual QuicSimpleServerStream* CreateStream(
+        QuicStreamId id,
+        QuicSpdySession* session,
+        QuicInMemoryCache* in_memory_cache) = 0;
   };
 
   class CryptoStreamFactory {
@@ -60,10 +63,12 @@ class QuicTestServer : public QuicServer {
         QuicServerSessionBase* session) = 0;
   };
 
-  explicit QuicTestServer(std::unique_ptr<ProofSource> proof_source);
+  QuicTestServer(std::unique_ptr<ProofSource> proof_source,
+                 QuicInMemoryCache* in_memory_cache);
   QuicTestServer(std::unique_ptr<ProofSource> proof_source,
                  const QuicConfig& config,
-                 const QuicVersionVector& supported_versions);
+                 const QuicVersionVector& supported_versions,
+                 QuicInMemoryCache* in_memory_cache);
 
   // Create a custom dispatcher which creates custom sessions.
   QuicDispatcher* CreateQuicDispatcher() override;
@@ -93,7 +98,9 @@ class ImmediateGoAwaySession : public QuicSimpleServerSession {
                          QuicSession::Visitor* visitor,
                          QuicCryptoServerStream::Helper* helper,
                          const QuicCryptoServerConfig* crypto_config,
-                         QuicCompressedCertsCache* compressed_certs_cache);
+                         QuicCompressedCertsCache* compressed_certs_cache,
+                         QuicInMemoryCache* in_memory_cache);
+
   // Override to send GoAway.
   void OnStreamFrame(const QuicStreamFrame& frame) override;
 };