Remove stl_util's deletion functions from MojoHostResolverImpl.

net/dns/mojo_host_resolver_impl.h

 // 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.
 
 #ifndef NET_DNS_MOJO_HOST_RESOLVER_IMPL_H_
 #define NET_DNS_MOJO_HOST_RESOLVER_IMPL_H_
 
-#include <set>
+#include <list>

[mmenke, 2016/11/11 16:18:03]

While you're here, mind adding <memory>?

[davidben, 2016/12/08 21:12:02]

Done.

 
 #include "base/macros.h"
 #include "base/threading/thread_checker.h"
 #include "net/interfaces/host_resolver_service.mojom.h"
 #include "net/log/net_log_with_source.h"
 
 namespace net {
 
 class HostResolver;
 
@@ skipping 10 matching lines @@
   ~MojoHostResolverImpl();
 
   void Resolve(std::unique_ptr<HostResolver::RequestInfo> request_info,
                interfaces::HostResolverRequestClientPtr client);
 
   bool request_in_progress() { return !pending_jobs_.empty(); }
 
  private:
   class Job;
 
-  // Removes |job| from the set of pending jobs, and deletes it.
-  void DeleteJob(Job* job);
+  // Removes |job| from the set of pending jobs.
+  void DeleteJob(std::list<Job>::iterator job);
 
   // Resolver for resolving incoming requests. Not owned.
   net::HostResolver* resolver_;
 
   // The NetLogWithSource to be passed to |resolver_| for all requests.
   const NetLogWithSource net_log_;
 
   // All pending jobs, so they can be cancelled when this service is destroyed.
-  // Owns all jobs.
-  std::set<Job*> pending_jobs_;
+  std::list<Job> pending_jobs_;
 
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoHostResolverImpl);
 };
 
 }  // namespace net
 
 #endif  // NET_DNS_MOJO_HOST_RESOLVER_IMPL_H_