Pass QuicInMemoryCache directly instead of using a singleton.

net/tools/quic/quic_simple_server_session.cc

 // 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.
 
 #include "net/tools/quic/quic_simple_server_session.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "net/quic/core/proto/cached_network_parameters.pb.h"
 #include "net/quic/core/quic_connection.h"
 #include "net/quic/core/quic_flags.h"
 #include "net/quic/core/quic_spdy_session.h"
 #include "net/tools/quic/quic_simple_server_stream.h"
 #include "url/gurl.h"
 
 using std::string;
 
 namespace net {
 
 QuicSimpleServerSession::QuicSimpleServerSession(
     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)
     : QuicServerSessionBase(config,
                             connection,
                             visitor,
                             helper,
                             crypto_config,
                             compressed_certs_cache),
-      highest_promised_stream_id_(0) {}
+      highest_promised_stream_id_(0),
+      in_memory_cache_(in_memory_cache) {}
 
 QuicSimpleServerSession::~QuicSimpleServerSession() {
   delete connection();
 }
 
 QuicCryptoServerStreamBase*
 QuicSimpleServerSession::CreateQuicCryptoServerStream(
     const QuicCryptoServerConfig* crypto_config,
     QuicCompressedCertsCache* compressed_certs_cache) {
   return new QuicCryptoServerStream(crypto_config, compressed_certs_cache,
@@ skipping 41 matching lines @@
   // Procese promised push request as many as possible.
   HandlePromisedPushRequests();
 }
 
 QuicSpdyStream* QuicSimpleServerSession::CreateIncomingDynamicStream(
     QuicStreamId id) {
   if (!ShouldCreateIncomingDynamicStream(id)) {
     return nullptr;
   }
 
-  QuicSpdyStream* stream = new QuicSimpleServerStream(id, this);
+  QuicSpdyStream* stream =
+      new QuicSimpleServerStream(id, this, in_memory_cache_);
   ActivateStream(base::WrapUnique(stream));
   return stream;
 }
 
 QuicSimpleServerStream* QuicSimpleServerSession::CreateOutgoingDynamicStream(
     SpdyPriority priority) {
   if (!ShouldCreateOutgoingDynamicStream()) {
     return nullptr;
   }
 
-  QuicSimpleServerStream* stream =
-      new QuicSimpleServerStream(GetNextOutgoingStreamId(), this);
+  QuicSimpleServerStream* stream = new QuicSimpleServerStream(
+      GetNextOutgoingStreamId(), this, in_memory_cache_);
   stream->SetPriority(priority);
   ActivateStream(base::WrapUnique(stream));
   return stream;
 }
 
 void QuicSimpleServerSession::CloseStreamInner(QuicStreamId stream_id,
                                                bool locally_reset) {
   QuicSpdySession::CloseStreamInner(stream_id, locally_reset);
   HandlePromisedPushRequests();
 }
@@ skipping 79 matching lines @@
     DVLOG(1) << "created server push stream " << promised_stream->id();
 
     SpdyHeaderBlock request_headers(std::move(promised_info.request_headers));
 
     promised_streams_.pop_front();
     promised_stream->PushResponse(std::move(request_headers));
   }
 }
 
 }  // namespace net