Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged

sync/internal_api/sync_manager_impl.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 "sync/internal_api/sync_manager_impl.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 436 matching lines @@
       &debug_info_event_listener_,
       &traffic_recorder_).Pass();
   session_context_->set_account_name(credentials.email);
   scheduler_ = internal_components_factory->BuildScheduler(
       name_, session_context_.get()).Pass();
 
   scheduler_->Start(SyncScheduler::CONFIGURATION_MODE);
 
   initialized_ = true;
 
-  net::NetworkChangeNotifier::AddIPAddressObserver(this);
-  net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
+  net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
   observing_network_connectivity_changes_ = true;
 
   UpdateCredentials(credentials);
 
   FOR_EACH_OBSERVER(SyncManager::Observer, observers_,
                     OnInitializationComplete(
                         MakeWeakHandle(weak_ptr_factory_.GetWeakPtr()),
                         MakeWeakHandle(debug_info_event_listener_.GetWeakPtr()),
                         true, InitialSyncEndedTypes()));
 }
@@ skipping 215 matching lines @@
   // TODO(akalin): Fix this behavior.
 
   if (invalidator_.get())
     invalidator_->UnregisterHandler(this);
   invalidator_.reset();
 
   if (connection_manager_.get())
     connection_manager_->RemoveListener(this);
   connection_manager_.reset();
 
-  net::NetworkChangeNotifier::RemoveIPAddressObserver(this);
-  net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
+  net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
   observing_network_connectivity_changes_ = false;
 
   if (initialized_ && directory()) {
     directory()->SaveChanges();
   }
 
   share_.directory.reset();
 
   change_delegate_ = NULL;
 
   initialized_ = false;
 
   // We reset these here, since only now we know they will not be
   // accessed from other threads (since we shut down everything).
   change_observer_.Reset();
   weak_handle_this_.Reset();
 }
 
-void SyncManagerImpl::OnIPAddressChanged() {
+void SyncManagerImpl::OnNetworkChanged(
+    net::NetworkChangeNotifier::ConnectionType type) {
+  if (type == net::NetworkChangeNotifier::CONNECTION_NONE)
+    return;

[szym, 2013/01/20 06:52:08]

It's not immediately apparent to me that scheduler_->OnConnectionStatusChange()
should not be called when we go offline.

But I checked SyncSchedulerImpl::OnConnectionStatusChange and it seems correct.
I suggest asking the maintainers of SyncScheduler/Impl to either update the
method name or accept an argument indicating if we are online.

   if (!observing_network_connectivity_changes_) {
-    DVLOG(1) << "IP address change dropped.";
+    DVLOG(1) << "Network change dropped.";
     return;
   }
-  DVLOG(1) << "IP address change detected.";
+  DVLOG(1) << "Network change detected.";
   OnNetworkConnectivityChangedImpl();
 }
 
-void SyncManagerImpl::OnConnectionTypeChanged(
-  net::NetworkChangeNotifier::ConnectionType) {
-  if (!observing_network_connectivity_changes_) {
-    DVLOG(1) << "Connection type change dropped.";
-    return;
-  }
-  DVLOG(1) << "Connection type change detected.";
-  OnNetworkConnectivityChangedImpl();
-}
-
 void SyncManagerImpl::OnNetworkConnectivityChangedImpl() {
   DCHECK(thread_checker_.CalledOnValidThread());
   scheduler_->OnConnectionStatusChange();
 }
 
 void SyncManagerImpl::OnServerConnectionEvent(
     const ServerConnectionEvent& event) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (event.connection_code ==
       HttpResponse::SERVER_CONNECTION_OK) {
@@ skipping 613 matching lines @@
 int SyncManagerImpl::GetDefaultNudgeDelay() {
   return kDefaultNudgeDelayMilliseconds;
 }
 
 // static.
 int SyncManagerImpl::GetPreferencesNudgeDelay() {
   return kPreferencesNudgeDelayMilliseconds;
 }
 
 }  // namespace syncer