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

net/proxy/mojo_proxy_resolver_impl.cc

 // Copyright 2015 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 "net/proxy/mojo_proxy_resolver_impl.h"
 
 #include <utility>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
-#include "base/stl_util.h"
 #include "net/base/net_errors.h"
 #include "net/proxy/mojo_proxy_resolver_v8_tracing_bindings.h"
 #include "net/proxy/mojo_proxy_type_converters.h"
 #include "net/proxy/proxy_info.h"
 #include "net/proxy/proxy_resolver_script_data.h"
 #include "net/proxy/proxy_resolver_v8_tracing.h"
 
 namespace net {
 
 class MojoProxyResolverImpl::Job {
@@ skipping 21 matching lines @@
   bool done_;
 
   DISALLOW_COPY_AND_ASSIGN(Job);
 };
 
 MojoProxyResolverImpl::MojoProxyResolverImpl(
     std::unique_ptr<ProxyResolverV8Tracing> resolver)
     : resolver_(std::move(resolver)) {}
 
 MojoProxyResolverImpl::~MojoProxyResolverImpl() {
-  base::STLDeleteElements(&resolve_jobs_);
 }
 
 void MojoProxyResolverImpl::GetProxyForUrl(
     const GURL& url,
     interfaces::ProxyResolverRequestClientPtr client) {
   DVLOG(1) << "GetProxyForUrl(" << url << ")";
-  Job* job = new Job(std::move(client), this, url);
-  bool inserted = resolve_jobs_.insert(job).second;
-  DCHECK(inserted);
-  job->Start();
+  std::unique_ptr<Job> job =
+      base::MakeUnique<Job>(std::move(client), this, url);
+  Job* job_ptr = job.get();
+  resolve_jobs_[job_ptr] = std::move(job);
+  job_ptr->Start();
 }
 
 void MojoProxyResolverImpl::DeleteJob(Job* job) {
-  size_t num_erased = resolve_jobs_.erase(job);
-  DCHECK(num_erased);
-  delete job;
+  auto it = resolve_jobs_.find(job);
+  DCHECK(it != resolve_jobs_.end());
+  resolve_jobs_.erase(it);
 }
 
 MojoProxyResolverImpl::Job::Job(
     interfaces::ProxyResolverRequestClientPtr client,
     MojoProxyResolverImpl* resolver,
     const GURL& url)
     : resolver_(resolver),
       client_(std::move(client)),
       url_(url),
       request_handle_(nullptr),
@@ skipping 28 matching lines @@
   }
   client_->ReportResult(error, std::move(result));
   resolver_->DeleteJob(this);
 }
 
 void MojoProxyResolverImpl::Job::OnConnectionError() {
   resolver_->DeleteJob(this);
 }
 
 }  // namespace net