diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-05 14:08:31 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-04-11 07:46:53 +0000 |
| commit | 6a4cabb866f66d4128a97cdc6d9d08ce074f1247 (patch) | |
| tree | ab00f70a5e89278d6a0d16ff0c42578dc4d84a2d /chromium/net/dns/host_resolver_impl.h | |
| parent | e733310db58160074f574c429d48f8308c0afe17 (diff) | |
| download | qtwebengine-chromium-6a4cabb866f66d4128a97cdc6d9d08ce074f1247.tar.gz | |
BASELINE: Update Chromium to 57.0.2987.144
Change-Id: I29db402ff696c71a04c4dbaec822c2e53efe0267
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'chromium/net/dns/host_resolver_impl.h')
| -rw-r--r-- | chromium/net/dns/host_resolver_impl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/net/dns/host_resolver_impl.h b/chromium/net/dns/host_resolver_impl.h index 373f2297ea0..0ad7146dfc9 100644 --- a/chromium/net/dns/host_resolver_impl.h +++ b/chromium/net/dns/host_resolver_impl.h @@ -179,8 +179,8 @@ class NET_EXPORT HostResolverImpl 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. @@ -263,7 +263,7 @@ class NET_EXPORT HostResolverImpl 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. void RemoveJob(Job* job); // Aborts all in progress jobs with ERR_NETWORK_CHANGED and notifies their |