Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged

net/base/host_resolver_impl.cc

Index: net/base/host_resolver_impl.cc
diff --git a/net/base/host_resolver_impl.cc b/net/base/host_resolver_impl.cc
index 0a3e8640fbeb12727e6816d35aaaa0f86b7162eb..42cb01e7fbd35a9eb67715138b7c35f666db6ffc 100644
--- a/net/base/host_resolver_impl.cc
+++ b/net/base/host_resolver_impl.cc
@@ -1682,7 +1682,7 @@ HostResolverImpl::HostResolverImpl(
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
   new LoopbackProbeJob(weak_ptr_factory_.GetWeakPtr());
 #endif
-  NetworkChangeNotifier::AddIPAddressObserver(this);
+  NetworkChangeNotifier::AddNetworkChangeObserver(this);
   NetworkChangeNotifier::AddDNSObserver(this);
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
     !defined(OS_ANDROID)
@@ -1702,7 +1702,7 @@ HostResolverImpl::~HostResolverImpl() {
   // This will also cancel all outstanding requests.
   STLDeleteValues(&jobs_);
 
-  NetworkChangeNotifier::RemoveIPAddressObserver(this);
+  NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
   NetworkChangeNotifier::RemoveDNSObserver(this);
 }
 
@@ -1847,7 +1847,7 @@ void HostResolverImpl::ProbeIPv6Support() {
   DCHECK(CalledOnValidThread());
   DCHECK(!ipv6_probe_monitoring_);
   ipv6_probe_monitoring_ = true;
-  OnIPAddressChanged();
+  OnNetworkChanged(net::NetworkChangeNotifier::CONNECTION_NONE);
 }
 
 void HostResolverImpl::SetDnsClientEnabled(bool enabled) {
@@ -2058,7 +2058,10 @@ void HostResolverImpl::TryServingAllJobsFromHosts() {
   }
 }
 
-void HostResolverImpl::OnIPAddressChanged() {
+void HostResolverImpl::OnNetworkChanged(
+    net::NetworkChangeNotifier::ConnectionType type) {
+  if (type != net::NetworkChangeNotifier::CONNECTION_NONE)
+    return;
   // Abandon all ProbeJobs.
   probe_weak_ptr_factory_.InvalidateWeakPtrs();
   if (cache_.get())