Add a unified observer to replace NetworkManagerObserver

chrome/browser/chromeos/mobile/mobile_activator.h

Index: chrome/browser/chromeos/mobile/mobile_activator.h
diff --git a/chrome/browser/chromeos/mobile/mobile_activator.h b/chrome/browser/chromeos/mobile/mobile_activator.h
index 49ea96c7b5b257bc0be7f70541e247a245154f42..6f34fee584e0a244df14b6d4bb0023b530bfb1fc 100644
--- a/chrome/browser/chromeos/mobile/mobile_activator.h
+++ b/chrome/browser/chromeos/mobile/mobile_activator.h
@@ -13,6 +13,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
+#include "chrome/browser/chromeos/net/connectivity_state_helper_observer.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace chromeos {
@@ -48,7 +49,7 @@ class CellularConfigDocument
 
 // This class performs mobile plan activation process.
 class MobileActivator
-  : public NetworkLibrary::NetworkManagerObserver,
+  : public ConnectivityStateHelperObserver,
     public NetworkLibrary::NetworkObserver,
     public base::SupportsWeakPtr<MobileActivator> {
  public:
@@ -129,8 +130,8 @@ class MobileActivator
   MobileActivator();
   virtual ~MobileActivator();
 
-  // NetworkLibrary::NetworkManagerObserver overrides.
-  virtual void OnNetworkManagerChanged(NetworkLibrary* obj) OVERRIDE;
+  // ConnectivityStateHelperObserver overrides.
+  virtual void NetworkManagerChanged() OVERRIDE;
   // NetworkLibrary::NetworkObserver overrides.
   virtual void OnNetworkChanged(NetworkLibrary* obj,
                                 const Network* network) OVERRIDE;