Pass QuicInMemoryCache directly instead of using a singleton.

net/tools/quic/quic_in_memory_cache.h

 // Copyright (c) 2012 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_QUIC_IN_MEMORY_CACHE_H_
 #define NET_TOOLS_QUIC_QUIC_IN_MEMORY_CACHE_H_
 
 #include <list>
 #include <map>
 #include <memory>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
-#include "base/memory/singleton.h"
 #include "base/strings/string_piece.h"
 #include "net/http/http_response_headers.h"
 #include "net/quic/core/spdy_utils.h"
 #include "net/spdy/spdy_framer.h"
 #include "url/gurl.h"
 
-namespace base {
-
-template <typename Type>
-struct DefaultSingletonTraits;
-
-}  // namespace base
-
 namespace net {
 
-namespace test {
-class QuicInMemoryCachePeer;
-}  // namespace test
-
 class QuicServer;
 
 // In-memory cache for HTTP responses.
 // Reads from disk cache generated by:
 // `wget -p --save_headers <url>`
 class QuicInMemoryCache {
  public:
   // A ServerPushInfo contains path of the push request and everything needed in
   // comprising a response for the push request.
   struct ServerPushInfo {
@@ skipping 85 matching lines @@
     std::vector<base::StringPiece> push_urls_;
 
    private:
     base::StringPiece host_;
     base::StringPiece path_;
     QuicInMemoryCache* cache_;
 
     DISALLOW_COPY_AND_ASSIGN(ResourceFile);
   };
 
-  // Returns the singleton instance of the cache.
-  static QuicInMemoryCache* GetInstance();
+  QuicInMemoryCache();
+  ~QuicInMemoryCache();
 
   // Retrieve a response from this cache for a given host and path..
   // If no appropriate response exists, nullptr is returned.
   const Response* GetResponse(base::StringPiece host,
                               base::StringPiece path) const;
 
   // Adds a simple response to the cache.  The response headers will
   // only contain the "content-length" header with the length of |body|.
   void AddSimpleResponse(base::StringPiece host,
                          base::StringPiece path,
@@ skipping 33 matching lines @@
   // 'response'.
   void AddDefaultResponse(Response* response);
 
   // |cache_cirectory| can be generated using `wget -p --save-headers <url>`.
   void InitializeFromDirectory(const std::string& cache_directory);
 
   // Find all the server push resources associated with |request_url|.
   std::list<ServerPushInfo> GetServerPushResources(std::string request_url);
 
  private:
-  friend struct base::DefaultSingletonTraits<QuicInMemoryCache>;
-  friend class test::QuicInMemoryCachePeer;
-
-  QuicInMemoryCache();
-  ~QuicInMemoryCache();
-
-  void ResetForTests();
-
   void AddResponseImpl(base::StringPiece host,
                        base::StringPiece path,
                        SpecialResponseType response_type,
                        SpdyHeaderBlock response_headers,
                        base::StringPiece response_body,
                        SpdyHeaderBlock response_trailers);
 
   std::string GetKey(base::StringPiece host, base::StringPiece path) const;
 
   // Add some server push urls with given responses for specified
@@ skipping 19 matching lines @@
   // Protects against concurrent access from test threads setting responses, and
   // server threads accessing those responses.
   mutable base::Lock response_mutex_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicInMemoryCache);
 };
 
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_IN_MEMORY_CACHE_H_