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

net/proxy/mojo_proxy_resolver_factory_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_factory_impl.h"
 
 #include <string>
 #include <utility>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
-#include "base/stl_util.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "net/base/net_errors.h"
 #include "net/proxy/mojo_proxy_resolver_impl.h"
 #include "net/proxy/mojo_proxy_resolver_v8_tracing_bindings.h"
 #include "net/proxy/proxy_resolver_factory.h"
 #include "net/proxy/proxy_resolver_v8_tracing.h"
 
 namespace net {
 
 class MojoProxyResolverFactoryImpl::Job {
@@ skipping 62 matching lines @@
 }
 
 MojoProxyResolverFactoryImpl::MojoProxyResolverFactoryImpl(
     std::unique_ptr<ProxyResolverV8TracingFactory> proxy_resolver_factory)
     : proxy_resolver_impl_factory_(std::move(proxy_resolver_factory)) {}
 
 MojoProxyResolverFactoryImpl::MojoProxyResolverFactoryImpl()
     : MojoProxyResolverFactoryImpl(ProxyResolverV8TracingFactory::Create()) {}
 
 MojoProxyResolverFactoryImpl::~MojoProxyResolverFactoryImpl() {
-  base::STLDeleteElements(&jobs_);
 }
 
 void MojoProxyResolverFactoryImpl::CreateResolver(
     const mojo::String& pac_script,
     mojo::InterfaceRequest<interfaces::ProxyResolver> request,
     interfaces::ProxyResolverFactoryRequestClientPtr client) {
   // The Job will call RemoveJob on |this| when either the create request
   // finishes or |request| or |client| encounters a connection error.
-  jobs_.insert(new Job(
+  std::unique_ptr<Job> job = base::MakeUnique<Job>(
       this, ProxyResolverScriptData::FromUTF8(pac_script.To<std::string>()),
       proxy_resolver_impl_factory_.get(), std::move(request),
-      std::move(client)));
+      std::move(client));
+  Job* job_ptr = job.get();
+  jobs_[job_ptr] = std::move(job);
 }
 
 void MojoProxyResolverFactoryImpl::RemoveJob(Job* job) {
-  size_t erased = jobs_.erase(job);
-  DCHECK_EQ(1u, erased);
-  delete job;
+  auto it = jobs_.find(job);
+  DCHECK(it != jobs_.end());
+  jobs_.erase(it);
 }
 
 }  // namespace net