Landing Recent QUIC changes until 01/28/2016 18:41 UTC

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 <map>
 #include <string>
+#include <unordered_map>
 
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/strings/string_piece.h"
 #include "net/quic/spdy_utils.h"
 #include "net/spdy/spdy_framer.h"
 #include "url/gurl.h"
 
 using base::StringPiece;
@@ skipping 79 matching lines @@
   void AddSimpleResponse(base::StringPiece host,
                          base::StringPiece path,
                          int response_code,
                          base::StringPiece body);
 
   // Add a simple response to the cache as AddSimpleResponse() does, and add
   // some server push resources(resource path, corresponding response status and
   // path) associated with it.
   // Push resource implicitly come from the same host.
   void AddSimpleResponseWithServerPushResources(
-      StringPiece host,
-      StringPiece path,
+      base::StringPiece host,
+      base::StringPiece path,
       int response_code,
-      StringPiece body,
-      list<ServerPushInfo> push_resources);
+      base::StringPiece body,
+      std::list<ServerPushInfo> push_resources);
 
   // Add a response to the cache.
   void AddResponse(base::StringPiece host,
                    base::StringPiece path,
                    const SpdyHeaderBlock& response_headers,
                    base::StringPiece response_body);
 
   // Add a response, with trailers, to the cache.
   void AddResponse(base::StringPiece host,
                    base::StringPiece path,
@@ skipping 10 matching lines @@
   // 'response'.
   void AddDefaultResponse(Response* response);
 
   // |cache_cirectory| can be generated using `wget -p --save-headers <url>`.
   void InitializeFromDirectory(const string& cache_directory);
 
   // Find all the server push resources associated with |request_url|.
   list<ServerPushInfo> GetServerPushResources(string request_url);
 
  private:
-  typedef base::hash_map<string, Response*> ResponseMap;
+  typedef std::unordered_map<std::string, Response*> ResponseMap;
 
   friend struct base::DefaultSingletonTraits<QuicInMemoryCache>;
   friend class test::QuicInMemoryCachePeer;
 
   QuicInMemoryCache();
   ~QuicInMemoryCache();
 
   void ResetForTests();
 
   void AddResponseImpl(base::StringPiece host,
                        base::StringPiece path,
                        SpecialResponseType response_type,
                        const SpdyHeaderBlock& response_headers,
                        base::StringPiece response_body,
                        const SpdyHeaderBlock& response_trailers);
 
   string GetKey(base::StringPiece host, base::StringPiece path) const;
 
   // Add some server push urls with given responses for specified
   // request if these push resources are not associated with this request yet.
-  void MaybeAddServerPushResources(StringPiece request_host,
-                                   StringPiece request_path,
-                                   list<ServerPushInfo> push_resources);
+  void MaybeAddServerPushResources(base::StringPiece request_host,
+                                   base::StringPiece request_path,
+                                   std::list<ServerPushInfo> push_resources);
 
   // Check if push resource(push_host/push_path) associated with given request
   // url already exists in server push map.
   bool PushResourceExistsInCache(string original_request_url,
                                  ServerPushInfo resource);
 
   // Cached responses.
   ResponseMap responses_;
 
   // The default response for cache misses, if set.
   scoped_ptr<Response> default_response_;
 
   // A map from request URL to associated server push responses (if any).
   std::multimap<string, ServerPushInfo> server_push_resources_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicInMemoryCache);
 };
 
 }  // namespace net
 
 #endif  // NET_TOOLS_QUIC_QUIC_IN_MEMORY_CACHE_H_