Pass QuicInMemoryCache directly instead of using a singleton.

net/tools/quic/test_tools/quic_test_server.h

 // Copyright (c) 2015 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.
 
 #ifndef NET_TOOLS_QUIC_TEST_TOOLS_QUIC_TEST_SERVER_H_
 #define NET_TOOLS_QUIC_TEST_TOOLS_QUIC_TEST_SERVER_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 19 matching lines @@
    public:
     virtual ~SessionFactory() {}
 
     // Returns a new session owned by the caller.
     virtual QuicServerSessionBase* CreateSession(
         const QuicConfig& config,
         QuicConnection* connection,
         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.
   class StreamFactory {
    public:
     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 {
    public:
     virtual ~CryptoStreamFactory() {}
 
     // Returns a new QuicCryptoServerStreamBase owned by the caller
     virtual QuicCryptoServerStreamBase* CreateCryptoStream(
         const QuicCryptoServerConfig* crypto_config,
         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;
 
   // Sets a custom session factory, owned by the caller, for easy custom
   // session logic. This is incompatible with setting a stream factory or a
   // crypto stream factory.
   void SetSessionFactory(SessionFactory* factory);
 
   // Sets a custom stream factory, owned by the caller, for easy custom
   // stream logic. This is incompatible with setting a session factory.
   void SetSpdyStreamFactory(StreamFactory* factory);
 
   // Sets a custom crypto stream factory, owned by the caller, for easy custom
   // crypto logic.  This is incompatible with setting a session factory.
   void SetCryptoStreamFactory(CryptoStreamFactory* factory);
 };
 
 // Useful test sessions for the QuicTestServer.
 
 // Test session which sends a GOAWAY immedaitely on creation, before crypto
 // credentials have even been established.
 class ImmediateGoAwaySession : public QuicSimpleServerSession {
  public:
   ImmediateGoAwaySession(const QuicConfig& config,
                          QuicConnection* connection,
                          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;
 };
 
 }  // namespace test
 
 
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_TEST_TOOLS_QUIC_TEST_SERVER_H_