Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(199)

Unified Diff: net/dns/host_resolver_impl.cc

Issue 1100763002: Inject CanAddURLToHistory into TopSitesImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@prefs
Patch Set: Fix error introduced during rebase Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/cert/multi_log_ct_verifier_unittest.cc ('k') | net/http/http_auth_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/dns/host_resolver_impl.cc
diff --git a/net/dns/host_resolver_impl.cc b/net/dns/host_resolver_impl.cc
index 5390462859c713f67a621e14d6a52a3808845f97..feb9a1bb887104ed34da348ee8530b0a6bb5c248 100644
--- a/net/dns/host_resolver_impl.cc
+++ b/net/dns/host_resolver_impl.cc
@@ -2189,15 +2189,10 @@ HostResolverImpl::Key HostResolverImpl::GetEffectiveKeyForRequest(
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x88 };
IPAddressNumber address(kIPv6Address,
kIPv6Address + arraysize(kIPv6Address));
- BoundNetLog probe_net_log = BoundNetLog::Make(
- net_log.net_log(), NetLog::SOURCE_IPV6_REACHABILITY_CHECK);
- probe_net_log.BeginEvent(NetLog::TYPE_IPV6_REACHABILITY_CHECK,
- net_log.source().ToEventParametersCallback());
- bool rv6 = IsGloballyReachable(address, probe_net_log);
- probe_net_log.EndEvent(NetLog::TYPE_IPV6_REACHABILITY_CHECK);
- if (rv6) {
- net_log.AddEvent(NetLog::TYPE_HOST_RESOLVER_IMPL_IPV6_SUPPORTED);
- } else {
+ bool rv6 = IsGloballyReachable(address, net_log);
+ net_log.AddEvent(NetLog::TYPE_HOST_RESOLVER_IMPL_IPV6_REACHABILITY_CHECK,
+ NetLog::BoolCallback("ipv6_available", rv6));
+ if (!rv6) {
effective_address_family = ADDRESS_FAMILY_IPV4;
effective_flags |= HOST_RESOLVER_DEFAULT_FAMILY_SET_DUE_TO_NO_IPV6;
}
« no previous file with comments | « net/cert/multi_log_ct_verifier_unittest.cc ('k') | net/http/http_auth_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698