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

net/dns/host_resolver_impl.h

 // Copyright (c) 2012 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_HOST_RESOLVER_IMPL_H_
 #define NET_DNS_HOST_RESOLVER_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 161 matching lines @@
   // Callback from HaveOnlyLoopbackAddresses probe.
   void SetHaveOnlyLoopbackAddresses(bool result);
 
  private:
   friend class HostResolverImplTest;
   class Job;
   class ProcTask;
   class LoopbackProbeJob;
   class DnsTask;
   class RequestImpl;
-  typedef HostCache::Key Key;
-  typedef std::map<Key, Job*> JobMap;
+  using Key = HostCache::Key;
+  using JobMap = std::map<Key, std::unique_ptr<Job>>;
 
   // Number of consecutive failures of DnsTask (with successful fallback to
   // ProcTask) before the DnsClient is disabled until the next DNS change.
   static const unsigned kMaximumDnsFailures;
 
   // Helper used by |Resolve()| and |ResolveFromCache()|.  Performs IP
   // literal, cache and HOSTS lookup (if enabled), returns OK if successful,
   // ERR_NAME_NOT_RESOLVED if either hostname is invalid or IP literal is
   // incompatible, ERR_DNS_CACHE_MISS if entry was not found in cache and
   // HOSTS and is not localhost.
@@ skipping 62 matching lines @@
   virtual bool IsIPv6Reachable(const NetLogWithSource& net_log);
 
   // Asynchronously checks if only loopback IPs are available.
   virtual void RunLoopbackProbeJob();
 
   // Records the result in cache if cache is present.
   void CacheResult(const Key& key,
                    const HostCache::Entry& entry,
                    base::TimeDelta ttl);
 
-  // Removes |job| from |jobs_|, only if it exists.
+  // Removes |job| from |jobs_|, only if it exists, but does not delete it.

[davidben, 2016/11/09 22:22:03]

Perhaps it'd be better for it to return std::unique_ptr<Job>? Then
CompleteRequests can be changed to:

    std::unique_ptr<Job> self_deleter = resolver_->RemoveJob(this);

[Avi (use Gerrit), 2016/11/09 23:09:22]

Done.

[Avi (use Gerrit), 2016/11/11 01:42:49]

Oh, boy. But the job might not be in jobs_, because it might be in the middle of
being aborted (see AbortAllInProgressJobs and how it removes the jobs from
jobs_).

The ownership is a bit nuts here. Still working out a better solution.

   void RemoveJob(Job* job);
 
   // Aborts all in progress jobs with ERR_NETWORK_CHANGED and notifies their
   // requests. Might start new jobs.
   void AbortAllInProgressJobs();
 
   // Aborts all in progress DnsTasks. In-progress jobs will fall back to
   // ProcTasks. Might start new jobs, if any jobs were taking up two dispatcher
   // slots.
   void AbortDnsTasks();
@@ skipping 113 matching lines @@
 // This function is only exposed so it can be unit-tested.
 // TODO(tfarina): It would be better to change the tests so this function
 // gets exercised indirectly through HostResolverImpl.
 NET_EXPORT_PRIVATE bool ResolveLocalHostname(base::StringPiece host,
                                              uint16_t port,
                                              AddressList* address_list);
 
 }  // namespace net
 
 #endif  // NET_DNS_HOST_RESOLVER_IMPL_H_