NetworkPortalDetector/NetworkStateInformer: Switch over to use NetworkStateHandler

chrome/browser/chromeos/net/network_portal_detector_stub.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_STUB_H_
 #define CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_STUB_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/hash_tables.h"
 #include "base/observer_list.h"
 #include "chrome/browser/chromeos/net/network_portal_detector.h"
 
 namespace chromeos {
 
 class NetworkPortalDetectorStub : public NetworkPortalDetector {
  public:
   NetworkPortalDetectorStub();
   virtual ~NetworkPortalDetectorStub();
 
   // NetworkPortalDetector implementation:
   virtual void Init() OVERRIDE;
   virtual void Shutdown() OVERRIDE;
   virtual void AddObserver(Observer* observer) OVERRIDE;
   virtual void AddAndFireObserver(Observer* observer) OVERRIDE;
   virtual void RemoveObserver(Observer* observer) OVERRIDE;
   virtual CaptivePortalState GetCaptivePortalState(
-      const chromeos::Network* network) OVERRIDE;
+      const chromeos::NetworkState* network) OVERRIDE;
   virtual bool IsEnabled() OVERRIDE;
   virtual void Enable(bool start_detection) OVERRIDE;
   virtual void EnableLazyDetection() OVERRIDE;
   virtual void DisableLazyDetection() OVERRIDE;
 
  private:
   friend class UpdateScreenTest;
 
   typedef std::string NetworkId;
   typedef base::hash_map<NetworkId, CaptivePortalState> CaptivePortalStateMap;
 
-  void SetActiveNetworkForTesting(const Network* network);
-  void SetDetectionResultsForTesting(const Network* network,
+  void SetDefaultNetworkForTesting(const NetworkState* network);
+  void SetDetectionResultsForTesting(const NetworkState* network,
                                      const CaptivePortalState& state);
   void NotifyObserversForTesting();
 
   ObserverList<Observer> observers_;
-  const Network* active_network_;
+  const NetworkState* default_network_;

[stevenjb, 2013/05/14 15:46:16]

I know this is just a stub, but I'd still rather copy NetworkState than store a
pointer to one (or used a scoped_ptr and pass ownership).

[gauravsh, 2013/05/14 21:51:15]

I noticed that UpdateScreenBrowserTest doesn't really care for anything other
than the service path, so I removed the NetworkState dependency there and
changed the testing methods here to take the service path instead.

   CaptivePortalStateMap portal_state_map_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkPortalDetectorStub);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_NET_NETWORK_PORTAL_DETECTOR_STUB_H_