Remove stl_util's STLDeleteContainerPairFirstPointers.

chrome/browser/predictors/resource_prefetcher.cc

 // Copyright 2014 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 "chrome/browser/predictors/resource_prefetcher.h"
 
 #include <iterator>
 #include <utility>
 
-#include "base/stl_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/io_buffer.h"
 #include "net/base/load_flags.h"
 #include "net/base/request_priority.h"
 #include "net/url_request/url_request_context.h"
 #include "url/origin.h"
 
 namespace {
 
 // The size of the buffer used to read the resource.
@@ skipping 27 matching lines @@
       navigation_id_(navigation_id),
       key_type_(key_type),
       request_vector_(std::move(requests)) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   DCHECK(request_vector_.get());
 
   std::copy(request_vector_->begin(), request_vector_->end(),
             std::back_inserter(request_queue_));
 }
 
-ResourcePrefetcher::~ResourcePrefetcher() {
-  // Delete any pending net::URLRequests.
-  base::STLDeleteContainerPairFirstPointers(inflight_requests_.begin(),
-                                            inflight_requests_.end());
-}
+ResourcePrefetcher::~ResourcePrefetcher() {}
 
 void ResourcePrefetcher::Start() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   CHECK_EQ(state_, INITIALIZED);
   state_ = RUNNING;
 
   TryToLaunchPrefetchRequests();
 }
 
@@ skipping 33 matching lines @@
       }
       request_available = request_it != request_queue_.end();
 
       if (request_available) {
         SendRequest(*request_it);
         request_queue_.erase(request_it);
       }
     }
   }
 
-  // If the inflight_requests_ is empty, we cant launch any more. Finish.
+  // If the inflight_requests_ is empty, we can't launch any more. Finish.
   if (inflight_requests_.empty()) {
     CHECK(host_inflight_counts_.empty());
     CHECK(request_queue_.empty() || state_ == STOPPED);
 
     state_ = FINISHED;
     delegate_->ResourcePrefetcherFinished(this, request_vector_.release());
   }
 }
 
 void ResourcePrefetcher::SendRequest(Request* request) {
   request->prefetch_status = Request::PREFETCH_STATUS_STARTED;
 
-  net::URLRequest* url_request =
-      delegate_->GetURLRequestContext()->CreateRequest(
-          request->resource_url, net::LOW, this).release();
+  std::unique_ptr<net::URLRequest> url_request_ptr =
+      delegate_->GetURLRequestContext()->CreateRequest(request->resource_url,
+                                                       net::LOW, this);
+  net::URLRequest* url_request = url_request_ptr.get();
 
-  inflight_requests_[url_request] = request;
+  inflight_requests_[url_request] = {std::move(url_request_ptr), request};
   host_inflight_counts_[url_request->original_url().host()] += 1;
 
   url_request->set_method("GET");
   url_request->set_first_party_for_cookies(navigation_id_.main_frame_url);
   url_request->set_initiator(url::Origin(navigation_id_.main_frame_url));
   url_request->SetReferrer(navigation_id_.main_frame_url.spec());
   url_request->SetLoadFlags(url_request->load_flags() | net::LOAD_PREFETCH);
   StartURLRequest(url_request);
 }
 
 void ResourcePrefetcher::StartURLRequest(net::URLRequest* request) {
   request->Start();
 }
 
 void ResourcePrefetcher::FinishRequest(net::URLRequest* request,
                                        Request::PrefetchStatus status) {
-  std::map<net::URLRequest*, Request*>::iterator request_it =
-      inflight_requests_.find(request);
+  auto request_it = inflight_requests_.find(request);
   CHECK(request_it != inflight_requests_.end());
 
   const std::string host = request->original_url().host();
   std::map<std::string, size_t>::iterator host_it = host_inflight_counts_.find(
       host);
   CHECK_GT(host_it->second, 0U);
   host_it->second -= 1;
   if (host_it->second == 0)
     host_inflight_counts_.erase(host);
 
-  request_it->second->prefetch_status = status;
+  request_it->second.second->prefetch_status = status;
   inflight_requests_.erase(request_it);
 
-  delete request;
-
   TryToLaunchPrefetchRequests();
 }
 
 void ResourcePrefetcher::ReadFullResponse(net::URLRequest* request) {
   bool status = true;
   while (status) {
     int bytes_read = 0;
     scoped_refptr<net::IOBuffer> buffer(new net::IOBuffer(
         kResourceBufferSizeBytes));
     status = request->Read(buffer.get(), kResourceBufferSizeBytes, &bytes_read);
@@ skipping 59 matching lines @@
   if (!request->status().is_success()) {
     FinishRequest(request, Request::PREFETCH_STATUS_FAILED);
     return;
   }
 
   if (ShouldContinueReadingRequest(request, bytes_read))
     ReadFullResponse(request);
 }
 
 }  // namespace predictors