NetworkPortalDetector/NetworkStateInformer: Switch over to use NetworkStateHandler

chrome/browser/chromeos/net/network_portal_detector.h

 // Copyright (c) 2013 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_H_
 #define CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_H_
 
 #include "base/basictypes.h"
 #include "net/url_request/url_fetcher.h"
 
 namespace chromeos {
 
-class Network;
+class NetworkState;
 
 // This class handles all notifications about network changes from
 // NetworkLibrary and delegates portal detection for the active
 // network to CaptivePortalService.
 class NetworkPortalDetector {
  public:
   enum CaptivePortalStatus {
     CAPTIVE_PORTAL_STATUS_UNKNOWN  = 0,
     CAPTIVE_PORTAL_STATUS_OFFLINE  = 1,
     CAPTIVE_PORTAL_STATUS_ONLINE   = 2,
@@ skipping 14 matching lines @@
 
   class Observer {
    public:
     // Called when portal detection is completed for |network|, or
     // when observers add themselves via AddAndFireObserver(). In the
     // second case, |network| is the active network and |state| is a
     // current portal state for the active network, which can be
     // currently in the unknown state, for instance, if portal
     // detection is in process for the active network.
     virtual void OnPortalDetectionCompleted(
-        const Network* network,
+        const NetworkState* network,
         const CaptivePortalState& state) = 0;
 
    protected:
     virtual ~Observer() {}
   };
 
   virtual void Init() = 0;
   virtual void Shutdown() = 0;
 
   // Adds |observer| to the observers list.
   virtual void AddObserver(Observer* observer) = 0;
 
   // Adds |observer| to the observers list and immediately calls
   // OnPortalDetectionCompleted() with the active network (which may
   // be NULL) and captive portal state for the active network (which
   // may be unknown, if, for instance, portal detection is in process
   // for the active network).
   //
   // WARNING: don't call this method from the Observer's ctors or
   // dtors, as it implicitly calls OnPortalDetectionCompleted(), which
   // is virtual.
   // TODO (ygorshenin@): find a way to avoid this restriction.
   virtual void AddAndFireObserver(Observer* observer) = 0;
 
   // Removes |observer| from the observers list.
   virtual void RemoveObserver(Observer* observer) = 0;
 
   // Returns Captive Portal state for a given |network|.
   virtual CaptivePortalState GetCaptivePortalState(
-      const chromeos::Network* network) = 0;
+      const chromeos::NetworkState* network) = 0;
 
   // Returns true if portal detection is enabled.
   virtual bool IsEnabled() = 0;
 
   // Enable portal detection. This method is needed because we can't
   // check current network for portal state unless user accepts EULA.
   // If |start_detection| is true and NetworkPortalDetector was
   // disabled previously, portal detection for the active network is
   // initiated by this method.
   virtual void Enable(bool start_detection) = 0;
@@ skipping 18 matching lines @@
   NetworkPortalDetector();
   virtual ~NetworkPortalDetector();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NetworkPortalDetector);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_H_