Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged

chrome/browser/policy/cloud_policy_subsystem.cc

Index: chrome/browser/policy/cloud_policy_subsystem.cc
diff --git a/chrome/browser/policy/cloud_policy_subsystem.cc b/chrome/browser/policy/cloud_policy_subsystem.cc
index bb1689d36b01d8a7c99353e87274ad0a6973f193..c00007358857f84724dd5671e835c3f08865fa2d 100644
--- a/chrome/browser/policy/cloud_policy_subsystem.cc
+++ b/chrome/browser/policy/cloud_policy_subsystem.cc
@@ -60,11 +60,13 @@ CloudPolicySubsystem::~CloudPolicySubsystem() {
   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();
   }
@@ -76,7 +78,7 @@ void CloudPolicySubsystem::Initialize(
     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(