NetworkPortalDetector/NetworkStateInformer: Switch over to use NetworkStateHandler

chrome/browser/ui/webui/chromeos/login/network_state_informer.h

Index: chrome/browser/ui/webui/chromeos/login/network_state_informer.h
diff --git a/chrome/browser/ui/webui/chromeos/login/network_state_informer.h b/chrome/browser/ui/webui/chromeos/login/network_state_informer.h
index 16fea0cdb5fba39318cc4fa025eb35592fb0ee8c..2ddb3ee6297a4b714c1cb15ee564707db10c2b48 100644
--- a/chrome/browser/ui/webui/chromeos/login/network_state_informer.h
+++ b/chrome/browser/ui/webui/chromeos/login/network_state_informer.h
@@ -9,17 +9,20 @@
 #include <string>
 
 #include "base/cancelable_callback.h"
+#include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
-#include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/captive_portal_window_proxy.h"
 #include "chrome/browser/chromeos/net/network_portal_detector.h"
+#include "chromeos/network/network_state_handler_observer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 
 namespace chromeos {
 
+class NetworkState;
+
 class NetworkStateInformerDelegate {
  public:
   NetworkStateInformerDelegate() {}
@@ -33,7 +36,7 @@ class NetworkStateInformerDelegate {
 // State is considered changed if connection or the active network has been
 // changed. Also, it answers to the requests about current network state.
 class NetworkStateInformer
-    : public chromeos::NetworkLibrary::NetworkManagerObserver,
+    : public chromeos::NetworkStateHandlerObserver,
       public chromeos::NetworkPortalDetector::Observer,
       public content::NotificationObserver,
       public CaptivePortalWindowProxyDelegate,
@@ -55,7 +58,7 @@ class NetworkStateInformer
 
     virtual void UpdateState(State state,
                              const std::string& service_path,
-                             ConnectionType connection_type,
+                             const std::string& connection_type,
                              const std::string& reason) = 0;
   };
 
@@ -71,12 +74,13 @@ class NetworkStateInformer
   // Removes observer.
   void RemoveObserver(NetworkStateInformerObserver* observer);
 
-  // NetworkLibrary::NetworkManagerObserver implementation:
-  virtual void OnNetworkManagerChanged(chromeos::NetworkLibrary* cros) OVERRIDE;
+  // NetworkStateHandlerObserver implementation:
+  virtual void NetworkManagerChanged() OVERRIDE;
+  virtual void DefaultNetworkChanged(const NetworkState* network) OVERRIDE;
 
   // NetworkPortalDetector::Observer implementation:
   virtual void OnPortalDetectionCompleted(
-      const Network* network,
+      const NetworkState* network,
       const NetworkPortalDetector::CaptivePortalState& state) OVERRIDE;
 
   // content::NotificationObserver implementation.
@@ -98,7 +102,7 @@ class NetworkStateInformer
   std::string last_network_service_path() const {
     return last_network_service_path_;
   }
-  ConnectionType last_network_type() const { return last_network_type_; }
+  std::string last_network_type() const { return last_network_type_; }
 
  private:
   struct ProxyState {
@@ -120,14 +124,14 @@ class NetworkStateInformer
 
   virtual ~NetworkStateInformer();
 
-  bool UpdateState(chromeos::NetworkLibrary* cros);
+  bool UpdateState();
 
   void UpdateStateAndNotify();
 
   void SendStateToObservers(const std::string& reason);
 
-  State GetNetworkState(const Network* network);
-  bool IsProxyConfigured(const Network* network);
+  State GetNetworkState(const NetworkState* network);
+  bool IsProxyConfigured(const NetworkState* network);
 
   content::NotificationRegistrar registrar_;
   State state_;
@@ -136,7 +140,7 @@ class NetworkStateInformer
   std::string last_online_service_path_;
   std::string last_connected_service_path_;
   std::string last_network_service_path_;
-  ConnectionType last_network_type_;
+  std::string last_network_type_;
   base::CancelableClosure check_state_;
 
   // Caches proxy state for active networks.