1 files changed, 20 insertions, 20 deletions

diff --git a/chromium/net/tools/quic/quic_http_response_cache.cc b/chromium/net/tools/quic/quic_http_response_cache.cc
index 65ff6390e92..68c57defa65 100644
--- a/chromium/net/tools/quic/quic_http_response_cache.cc
+++ b/chromium/net/tools/quic/quic_http_response_cache.cc
@@ -8,10 +8,10 @@
 
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
-#include "base/stl_util.h"
 #include "net/http/http_util.h"
 #include "net/quic/platform/api/quic_bug_tracker.h"
 #include "net/quic/platform/api/quic_logging.h"
+#include "net/quic/platform/api/quic_map_util.h"
 #include "net/quic/platform/api/quic_ptr_util.h"
 #include "net/quic/platform/api/quic_text_utils.h"
 #include "net/spdy/spdy_http_utils.h"
@@ -23,11 +23,10 @@ using std::string;
 
 namespace net {
 
-QuicHttpResponseCache::ServerPushInfo::ServerPushInfo(
-    GURL request_url,
-    SpdyHeaderBlock headers,
-    net::SpdyPriority priority,
-    string body)
+QuicHttpResponseCache::ServerPushInfo::ServerPushInfo(QuicUrl request_url,
+                                                      SpdyHeaderBlock headers,
+                                                      SpdyPriority priority,
+                                                      string body)
     : request_url(request_url),
       headers(std::move(headers)),
       priority(priority),
@@ -45,6 +44,12 @@ QuicHttpResponseCache::Response::Response()
 
 QuicHttpResponseCache::Response::~Response() {}
 
+QuicHttpResponseCache::ResourceFile::ResourceFile(
+    const base::FilePath& file_name)
+    : file_name_(file_name), file_name_string_(file_name.AsUTF8Unsafe()) {}
+
+QuicHttpResponseCache::ResourceFile::~ResourceFile() {}
+
 void QuicHttpResponseCache::ResourceFile::Read() {
   base::ReadFileToString(FilePath(file_name_), &file_contents_);
 
@@ -123,12 +128,6 @@ void QuicHttpResponseCache::ResourceFile::Read() {
       StringPiece(file_contents_.data() + start, file_contents_.size() - start);
 }
 
-QuicHttpResponseCache::ResourceFile::ResourceFile(
-    const base::FilePath& file_name)
-    : file_name_(file_name), file_name_string_(file_name.AsUTF8Unsafe()) {}
-
-QuicHttpResponseCache::ResourceFile::~ResourceFile() {}
-
 void QuicHttpResponseCache::ResourceFile::SetHostPathFromBase(
     StringPiece base) {
   size_t path_start = base.find_first_of('/');
@@ -270,14 +269,14 @@ void QuicHttpResponseCache::InitializeFromDirectory(
   for (const auto& resource_file : resource_files) {
     std::list<ServerPushInfo> push_resources;
     for (const auto& push_url : resource_file->push_urls()) {
-      GURL url(push_url);
+      QuicUrl url(push_url);
       const Response* response = GetResponse(url.host(), url.path());
       if (!response) {
         QUIC_BUG << "Push URL '" << push_url << "' not found.";
         return;
       }
       push_resources.push_back(ServerPushInfo(url, response->headers().Clone(),
-                                              net::kV3LowestPriority,
+                                              kV3LowestPriority,
                                               response->body().as_string()));
     }
     MaybeAddServerPushResources(resource_file->host(), resource_file->path(),
@@ -316,11 +315,11 @@ void QuicHttpResponseCache::AddResponseImpl(StringPiece host,
 
   DCHECK(!host.empty()) << "Host must be populated, e.g. \"www.google.com\"";
   string key = GetKey(host, path);
-  if (base::ContainsKey(responses_, key)) {
+  if (QuicContainsKey(responses_, key)) {
     QUIC_BUG << "Response for '" << key << "' already exists!";
     return;
   }
-  std::unique_ptr<Response> new_response = QuicMakeUnique<Response>();
+  auto new_response = QuicMakeUnique<Response>();
   new_response->set_response_type(response_type);
   new_response->set_headers(std::move(response_headers));
   new_response->set_body(response_body);
@@ -345,7 +344,8 @@ void QuicHttpResponseCache::MaybeAddServerPushResources(
     }
 
     QUIC_DVLOG(1) << "Add request-resource association: request url "
-                  << request_url << " push url " << push_resource.request_url
+                  << request_url << " push url "
+                  << push_resource.request_url.ToString()
                   << " response headers "
                   << push_resource.headers.DebugString();
     {
@@ -360,8 +360,7 @@ void QuicHttpResponseCache::MaybeAddServerPushResources(
     bool found_existing_response = false;
     {
       QuicWriterMutexLock lock(&response_mutex_);
-      found_existing_response =
-          base::ContainsKey(responses_, GetKey(host, path));
+      found_existing_response = QuicContainsKey(responses_, GetKey(host, path));
     }
     if (!found_existing_response) {
       // Add a server push response to responses map, if it is not in the map.
@@ -381,7 +380,8 @@ bool QuicHttpResponseCache::PushResourceExistsInCache(
       server_push_resources_.equal_range(original_request_url);
   for (auto it = resource_range.first; it != resource_range.second; ++it) {
     ServerPushInfo push_resource = it->second;
-    if (push_resource.request_url.spec() == resource.request_url.spec()) {
+    if (push_resource.request_url.ToString() ==
+        resource.request_url.ToString()) {
       return true;
     }
   }