Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged

chrome/browser/net/dns_probe_service.cc

 // 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.
 
 #include "chrome/browser/net/dns_probe_service.h"
 
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/net/dns_probe_job.h"
@@ skipping 60 matching lines @@
 const int kNameserverCountMax = 10;
 
 }  // namespace
 
 DnsProbeService::DnsProbeService()
     : system_result_(DnsProbeJob::SERVERS_UNKNOWN),
       public_result_(DnsProbeJob::SERVERS_UNKNOWN),
       state_(STATE_NO_RESULTS),
       result_(chrome_common_net::DNS_PROBE_UNKNOWN),
       dns_attempts_(GetAttemptsFromFieldTrial()) {
-  NetworkChangeNotifier::AddIPAddressObserver(this);
+  NetworkChangeNotifier::AddNetworkChangeObserver(this);
 }
 
 DnsProbeService::~DnsProbeService() {
-  NetworkChangeNotifier::RemoveIPAddressObserver(this);
+  NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
 }
 
 void DnsProbeService::ProbeDns(const DnsProbeService::CallbackType& callback) {
   callbacks_.push_back(callback);
 
   if (state_ == STATE_RESULTS_CACHED && ResultsExpired())
     ExpireResults();
 
   switch (state_) {
   case STATE_NO_RESULTS:
@@ skipping 15 matching lines @@
   return CreateProbeJob(system_config, job_callback);
 }
 
 scoped_ptr<DnsProbeJob> DnsProbeService::CreatePublicProbeJob(
     const DnsProbeJob::CallbackType& job_callback) {
   DnsConfig public_config;
   GetPublicDnsConfig(&public_config);
   return CreateProbeJob(public_config, job_callback);
 }
 
-void DnsProbeService::OnIPAddressChanged() {
-  if (state_ == STATE_RESULTS_CACHED)
+void DnsProbeService::OnNetworkChanged(
+    net::NetworkChangeNotifier::ConnectionType type) {
+  if (type == net::NetworkChangeNotifier::CONNECTION_NONE &&
+      state_ == STATE_RESULTS_CACHED)
     ExpireResults();
 }
 
 void DnsProbeService::ExpireResults() {
   DCHECK_EQ(STATE_RESULTS_CACHED, state_);
 
   state_ = STATE_NO_RESULTS;
   result_ = chrome_common_net::DNS_PROBE_UNKNOWN;
 }
 
@@ skipping 196 matching lines @@
     config->attempts = dns_attempts_;
 }
 
 bool DnsProbeService::ResultsExpired() {
   const base::TimeDelta kMaxResultAge =
       base::TimeDelta::FromMilliseconds(kMaxResultAgeMs);
   return base::Time::Now() - probe_start_time_ > kMaxResultAge;
 }
 
 } // namespace chrome_browser_net