summaryrefslogtreecommitdiffstats
path: root/net/dns/host_resolver_impl.h
diff options
context:
space:
mode:
authormmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-22 16:05:12 +0000
committermmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-22 16:05:12 +0000
commit70c04ab87ac18db2b7cfe301b634f4c3571bae27 (patch)
treec1069acd3f9a64e13f6cbf6deb8b83c4dea67a3b /net/dns/host_resolver_impl.h
parent167c71249ca6de270b3dba75ca94f5de2deb3ea4 (diff)
downloadchromium_src-70c04ab87ac18db2b7cfe301b634f4c3571bae27.zip
chromium_src-70c04ab87ac18db2b7cfe301b634f4c3571bae27.tar.gz
chromium_src-70c04ab87ac18db2b7cfe301b634f4c3571bae27.tar.bz2
Revert 218616 "[net/dns] Perform A/AAAA queries for AF_UNSPEC re..."
This was causing crashes in the case of DNS responses with no addresses. > [net/dns] Perform A/AAAA queries for AF_UNSPEC resolutions in parallel. > > The second DnsTransaction is scheduled as a second job on the resolver's > PrioritizedDispatcher, at the beginning of its priority queue. The two > DnsTransactions run independently of each other, although if one of them > finishes with an error, the other one will be scrapped immediately, and > the Job will fall back to ProcTask. > > BUG=174992 > > Review URL: https://chromiumcodereview.appspot.com/19498003 TBR=mmenke@chromium.org BUG=277625 Review URL: https://codereview.chromium.org/23102009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219027 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/dns/host_resolver_impl.h')
-rw-r--r--net/dns/host_resolver_impl.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/dns/host_resolver_impl.h b/net/dns/host_resolver_impl.h
index c25adb5..aa6421c 100644
--- a/net/dns/host_resolver_impl.h
+++ b/net/dns/host_resolver_impl.h
@@ -225,10 +225,8 @@ class NET_EXPORT HostResolverImpl
// and resulted in |net_error|.
void OnDnsTaskResolve(int net_error);
- // Allows the tests to catch slots leaking out of the dispatcher. One
- // HostResolverImpl::Job could occupy multiple PrioritizedDispatcher job
- // slots.
- size_t num_running_dispatcher_jobs_for_tests() const {
+ // Allows the tests to catch slots leaking out of the dispatcher.
+ size_t num_running_jobs_for_tests() const {
return dispatcher_.num_running_jobs();
}