Landing Recent QUIC changes until Sun Sep 4 03:41:00

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>
@@ skipping 216 matching lines @@
 
   // Cached responses.
   ResponseMap responses_;
 
   // The default response for cache misses, if set.
   std::unique_ptr<Response> default_response_;
 
   // A map from request URL to associated server push responses (if any).
   std::multimap<std::string, ServerPushInfo> server_push_resources_;
 
+  // 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_