Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged

chrome/browser/policy/cloud_policy_refresh_scheduler.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/policy/cloud_policy_refresh_scheduler.h"
 
 #include <algorithm>
 
 #include "base/task_runner.h"
 #include "chrome/browser/policy/cloud_policy_constants.h"
@@ skipping 17 matching lines @@
     CloudPolicyClient* client,
     CloudPolicyStore* store,
     const scoped_refptr<base::TaskRunner>& task_runner)
     : client_(client),
       store_(store),
       task_runner_(task_runner),
       error_retry_delay_ms_(kInitialErrorRetryDelayMs),
       refresh_delay_ms_(kDefaultRefreshDelayMs) {
   client_->AddObserver(this);
   store_->AddObserver(this);
-  net::NetworkChangeNotifier::AddIPAddressObserver(this);
+  net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
 
   UpdateLastRefreshFromPolicy();
   ScheduleRefresh();
 }
 
 CloudPolicyRefreshScheduler::~CloudPolicyRefreshScheduler() {
   store_->RemoveObserver(this);
   client_->RemoveObserver(this);
-  net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
+  net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
 }
 
 void CloudPolicyRefreshScheduler::SetRefreshDelay(int64 refresh_delay) {
   refresh_delay_ms_ = std::min(std::max(refresh_delay, kRefreshDelayMinMs),
                                kRefreshDelayMaxMs);
   ScheduleRefresh();
 }
 
 void CloudPolicyRefreshScheduler::OnPolicyFetched(CloudPolicyClient* client) {
   error_retry_delay_ms_ = kInitialErrorRetryDelayMs;
@@ skipping 38 matching lines @@
   ScheduleRefresh();
 }
 
 void CloudPolicyRefreshScheduler::OnStoreError(CloudPolicyStore* store) {
   // If |store_| fails, the is_managed bit that it provides may become stale.
   // The best guess in that situation is to assume is_managed didn't change and
   // continue using the stale information. Thus, no specific response to a store
   // error is required. NB: Changes to is_managed fire OnStoreLoaded().
 }
 
-void CloudPolicyRefreshScheduler::OnIPAddressChanged() {
-  if (client_->status() == DM_STATUS_REQUEST_FAILED)
+void CloudPolicyRefreshScheduler::OnNetworkChanged(
+    net::NetworkChangeNotifier::ConnectionType type) {
+  if (type != net::NetworkChangeNotifier::CONNECTION_NONE &&
+      client_->status() == DM_STATUS_REQUEST_FAILED)
     RefreshAfter(0);
 }
 
 void CloudPolicyRefreshScheduler::UpdateLastRefreshFromPolicy() {
   if (!last_refresh_.is_null())
     return;
 
   // If the client has already fetched policy, assume that happened recently. If
   // that assumption ever breaks, the proper thing to do probably is to move the
   // |last_refresh_| bookkeeping to CloudPolicyClient.
@@ skipping 79 matching lines @@
   base::TimeDelta delay =
       std::max((last_refresh_ + delta) - base::Time::NowFromSystemTime(),
                base::TimeDelta());
   refresh_callback_.Reset(
       base::Bind(&CloudPolicyRefreshScheduler::PerformRefresh,
                  base::Unretained(this)));
   task_runner_->PostDelayedTask(FROM_HERE, refresh_callback_.callback(), delay);
 }
 
 }  // namespace policy