Add a unified observer to replace NetworkManagerObserver

chrome/browser/chromeos/mobile/mobile_activator.cc

Index: chrome/browser/chromeos/mobile/mobile_activator.cc
diff --git a/chrome/browser/chromeos/mobile/mobile_activator.cc b/chrome/browser/chromeos/mobile/mobile_activator.cc
index cd552ef649a813ed86d95d4dd9ab44eed3f0a440..cd1c9e45011a5020261c52c3f8d14af616201425 100644
--- a/chrome/browser/chromeos/mobile/mobile_activator.cc
+++ b/chrome/browser/chromeos/mobile/mobile_activator.cc
@@ -25,7 +25,7 @@
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/cros/network_library.h"
+#include "chrome/browser/chromeos/net/connectivity_state_helper.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 
@@ -172,8 +172,8 @@ void MobileActivator::TerminateActivation() {
   continue_reconnect_timer_.Stop();
   reconnect_timeout_timer_.Stop();
 
+  ConnectivityStateHelper::Get()->RemoveNetworkManagerObserver(this);
   NetworkLibrary* lib = GetNetworkLibrary();

[stevenjb, 2013/03/11 23:11:05]

I'd feel more comfortable converting all of this at once; depending on both
NetworkStateHandler and NetowrkLibrary might have consistency issues so I would
like to limit the places we do this.

[gauravsh, 2013/03/12 00:30:25]

This will still use the NetworkLibrary path in production.

The NetworkStateHandler path should only ever be used if the
--enable-new-network-change-notifier flag is set. We will not be turning on that
flag by default until all consumers have been converted to use the connectivity
state wrappers.

[stevenjb, 2013/03/12 15:53:34]

We will almost certainly want to turn on --enable-new-network-change-notifier
before we eliminate NetworkLibrary entirely, and I would like to minimize the
places where we use both in the same code. Given that this change is small and
not essential to this CL, I would really rather convert the entire file at once.

-  lib->RemoveNetworkManagerObserver(this);
   lib->RemoveObserverForAllNetworks(this);
   if (lib->IsLocked())
     lib->Unlock();
@@ -188,7 +188,7 @@ void MobileActivator::TerminateActivation() {
   cellular_config_ = new CellularConfigDocument();
 }
 
-void MobileActivator::OnNetworkManagerChanged(NetworkLibrary* cros) {
+void MobileActivator::NetworkManagerChanged() {
   if (state_ == PLAN_ACTIVATION_PAGE_LOADING)
     return;
   EvaluateCellularNetwork(FindMatchingCellularNetwork(true));
@@ -373,7 +373,7 @@ void MobileActivator::StartActivation() {
   }
 
   // Start monitoring network property changes.
-  lib->AddNetworkManagerObserver(this);
+  ConnectivityStateHelper::Get()->AddNetworkManagerObserver(this);
   if (network->activate_over_non_cellular_network()) {
     // Fast forward to payment portal loading if the activation is performed
     // over a non-cellular network.
@@ -740,8 +740,8 @@ const char* MobileActivator::GetStateDescription(PlanActivationState state) {
 void MobileActivator::CompleteActivation(
     CellularNetwork* network) {
   // Remove observers, we are done with this page.
+  ConnectivityStateHelper::Get()->RemoveNetworkManagerObserver(this);
   NetworkLibrary* lib = GetNetworkLibrary();
-  lib->RemoveNetworkManagerObserver(this);
   lib->RemoveObserverForAllNetworks(this);
   if (lib->IsLocked())
     lib->Unlock();