Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged

chrome/browser/policy/cloud_policy_subsystem.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_subsystem.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 42 matching lines @@
     CloudPolicyCacheBase* policy_cache,
     const std::string& device_management_url) {
   Initialize(data_store, policy_cache, device_management_url);
 }
 
 CloudPolicySubsystem::~CloudPolicySubsystem() {
   cloud_policy_controller_.reset();
   device_token_fetcher_.reset();
   cloud_policy_cache_.reset();
   device_management_service_.reset();
-  net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
+  net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
 }
 
-void CloudPolicySubsystem::OnIPAddressChanged() {
-  if (state() == CloudPolicySubsystem::NETWORK_ERROR &&
+void CloudPolicySubsystem::OnNetworkChanged(
+    net::NetworkChangeNotifier::ConnectionType type) {
+  if (type != net::NetworkChangeNotifier::CONNECTION_NONE &&
+      state() == CloudPolicySubsystem::NETWORK_ERROR &&
       cloud_policy_controller_.get()) {
     cloud_policy_controller_->Retry();
   }
 }
 
 void CloudPolicySubsystem::Initialize(
     CloudPolicyDataStore* data_store,
     CloudPolicyCacheBase* policy_cache,
     const std::string& device_management_url) {
   device_management_url_ = device_management_url;
   data_store_ = data_store;
-  net::NetworkChangeNotifier::AddIPAddressObserver(this);
+  net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
   notifier_.reset(new PolicyNotifier());
   if (!device_management_url_.empty()) {
     device_management_service_.reset(new DeviceManagementService(
         device_management_url));
     cloud_policy_cache_.reset(policy_cache);
     cloud_policy_cache_->set_policy_notifier(notifier_.get());
     cloud_policy_cache_->Load();
     CreateDeviceTokenFetcher();
   }
 }
@@ skipping 102 matching lines @@
 CloudPolicyCacheBase* CloudPolicySubsystem::GetCloudPolicyCacheBase() const {
   return cloud_policy_cache_.get();
 }
 
 CloudPolicySubsystem::CloudPolicySubsystem()
     : refresh_pref_name_(NULL),
       data_store_(NULL) {
 }
 
 }  // namespace policy