Add a unified observer to replace NetworkManagerObserver

chrome/browser/chromeos/net/connectivity_state_helper.h

Index: chrome/browser/chromeos/net/connectivity_state_helper.h
diff --git a/chrome/browser/chromeos/net/connectivity_state_helper.h b/chrome/browser/chromeos/net/connectivity_state_helper.h
index 030b5c691e44a7be017b7e5386a3039224fe96cf..e41a7b1906643cd65829717da9383a7c097cf11b 100644
--- a/chrome/browser/chromeos/net/connectivity_state_helper.h
+++ b/chrome/browser/chromeos/net/connectivity_state_helper.h
@@ -5,9 +5,10 @@
 #ifndef CHROME_BROWSER_CHROMEOS_NET_CONNECTIVITY_STATE_HELPER_H_
 #define CHROME_BROWSER_CHROMEOS_NET_CONNECTIVITY_STATE_HELPER_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 "chromeos/network/network_state_handler.h"
-#include "chromeos/network/network_state_handler_observer.h"
 
 namespace chromeos {
 
@@ -16,7 +17,7 @@ namespace chromeos {
 // appropriate source (e.g. NetworkStateHandler).
 class ConnectivityStateHelper {
  public:
-  virtual ~ConnectivityStateHelper() {}
+  virtual ~ConnectivityStateHelper();
 
   // Initializes the state helper singleton to use the default (network state
   // handler) implementation or the network library implementation based
@@ -27,6 +28,9 @@ class ConnectivityStateHelper {
   // (say,a MockConnectivityStateHelper) implementation.
   static void InitializeForTesting(ConnectivityStateHelper* csh);
 
+  // Returns true if the global instance has been initialized.
+  static bool IsInitialized();
+
   static void Shutdown();
   static ConnectivityStateHelper* Get();
 
@@ -49,8 +53,18 @@ class ConnectivityStateHelper {
   // Returns true if we have a default network and are in online state.
   virtual bool DefaultNetworkOnline() = 0;
 
+  // Request a network scan.
+  virtual void RequestScan() const = 0;
+
+  // Add/remove observers for listening to connection manager changes.
+  virtual void AddNetworkManagerObserver(
+      ConnectivityStateHelperObserver* observer);
+  virtual void RemoveNetworkManagerObserver(
+      ConnectivityStateHelperObserver* observer);
+
  protected:
-  ConnectivityStateHelper() {}
+  ConnectivityStateHelper();
+  ObserverList<ConnectivityStateHelperObserver> network_manager_observers_;
 };
 
 }  // namespace chromeos