Remove stl_util's deletion functions from net/url_request/.

BUG=555865

Review-Url: https://codereview.chromium.org/2385003002
Cr-Commit-Position: refs/heads/master@{#422888}

net/url_request/report_sender.cc

@@ -6,7 +6,6 @@
 
 #include <utility>
 
-#include "base/stl_util.h"
 #include "net/base/elements_upload_data_stream.h"
 #include "net/base/load_flags.h"
 #include "net/base/request_priority.h"
@@ -28,8 +27,6 @@ ReportSender::ReportSender(URLRequestContext* request_context,
       error_callback_(error_callback) {}
 
 ReportSender::~ReportSender() {
-  // Cancel all of the uncompleted requests.
-  base::STLDeleteElements(&inflight_requests_);
 }
 
 void ReportSender::Send(const GURL& report_uri,
@@ -59,7 +56,7 @@ void ReportSender::Send(const GURL& report_uri,
       ElementsUploadDataStream::CreateWithReader(std::move(reader), 0));
 
   URLRequest* raw_url_request = url_request.get();
-  inflight_requests_.insert(url_request.release());
+  inflight_requests_[raw_url_request] = std::move(url_request);
   raw_url_request->Start();
 }
 
@@ -77,8 +74,6 @@ void ReportSender::OnResponseStarted(URLRequest* request, int net_error) {
   }
 
   CHECK_GT(inflight_requests_.erase(request), 0u);
-  // Clean up the request, which cancels it.
-  delete request;
 }
 
 void ReportSender::OnReadCompleted(URLRequest* request, int bytes_read) {

net/url_request/report_sender.h

@@ -5,8 +5,8 @@
 #ifndef NET_URL_REQUEST_REPORT_SENDER_H_
 #define NET_URL_REQUEST_REPORT_SENDER_H_
 
+#include <map>
 #include <memory>
-#include <set>
 #include <string>
 
 #include "base/callback.h"
@@ -69,8 +69,7 @@ class NET_EXPORT ReportSender
 
   CookiesPreference cookies_preference_;
 
-  // Owns the contained requests.
-  std::set<URLRequest*> inflight_requests_;
+  std::map<URLRequest*, std::unique_ptr<URLRequest>> inflight_requests_;
 
   // Called when a sent report results in an error.
   ErrorCallback error_callback_;