NetworkPortalDetector/NetworkStateInformer: Switch over to use NetworkStateHandler

chrome/browser/chromeos/net/network_portal_detector_stub.cc

Index: chrome/browser/chromeos/net/network_portal_detector_stub.cc
diff --git a/chrome/browser/chromeos/net/network_portal_detector_stub.cc b/chrome/browser/chromeos/net/network_portal_detector_stub.cc
index 35af222f2b33013af9088e878d273038ba0adbf3..176c684f56403e7bc891e1d54ad708627deb1d6a 100644
--- a/chrome/browser/chromeos/net/network_portal_detector_stub.cc
+++ b/chrome/browser/chromeos/net/network_portal_detector_stub.cc
@@ -4,11 +4,12 @@
 
 #include "chrome/browser/chromeos/net/network_portal_detector_stub.h"
 
-#include "chrome/browser/chromeos/cros/network_library.h"
+#include "chromeos/network/network_state.h"
 
 namespace chromeos {
 
-NetworkPortalDetectorStub::NetworkPortalDetectorStub() : active_network_(NULL) {
+NetworkPortalDetectorStub::NetworkPortalDetectorStub()
+  : default_network_(NULL) {
 }
 
 NetworkPortalDetectorStub::~NetworkPortalDetectorStub() {
@@ -29,13 +30,14 @@ void NetworkPortalDetectorStub::AddAndFireObserver(Observer* observer) {
   AddObserver(observer);
   if (!observer)
     return;
-  if (!active_network_ ||
-      !portal_state_map_.count(active_network_->service_path())) {
-    observer->OnPortalDetectionCompleted(active_network_, CaptivePortalState());
+  if (!default_network_ ||
+      !portal_state_map_.count(default_network_->path())) {
+    observer->OnPortalDetectionCompleted(default_network_.get(),
+                                         CaptivePortalState());
   } else {
     observer->OnPortalDetectionCompleted(
-        active_network_,
-        portal_state_map_[active_network_->service_path()]);
+        default_network_.get(),
+        portal_state_map_[default_network_->path()]);
   }
 }
 
@@ -46,10 +48,10 @@ void NetworkPortalDetectorStub::RemoveObserver(Observer* observer) {
 
 NetworkPortalDetector::CaptivePortalState
 NetworkPortalDetectorStub::GetCaptivePortalState(
-    const chromeos::Network* network) {
-  if (!network || !portal_state_map_.count(network->service_path()))
+    const chromeos::NetworkState* network) {
+  if (!network || !portal_state_map_.count(network->path()))
     return CaptivePortalState();
-  return portal_state_map_[network->service_path()];
+  return portal_state_map_[network->path()];
 }
 
 bool NetworkPortalDetectorStub::IsEnabled() {
@@ -69,27 +71,30 @@ void NetworkPortalDetectorStub::EnableLazyDetection() {
 void NetworkPortalDetectorStub::DisableLazyDetection() {
 }
 
-void NetworkPortalDetectorStub::SetActiveNetworkForTesting(
-    const Network* network) {
-  active_network_ = network;
+void NetworkPortalDetectorStub::SetDefaultNetworkPathForTesting(
+    const std::string& service_path) {
+  if (service_path.empty())
+    default_network_.reset();
+  else
+    default_network_.reset(new NetworkState(service_path));
 }
 
 void NetworkPortalDetectorStub::SetDetectionResultsForTesting(
-    const Network* network,
+    const std::string& service_path,
     const CaptivePortalState& state) {
-  if (!network)
+  if (service_path.empty())
     return;
-  portal_state_map_[network->service_path()] = state;
+  portal_state_map_[service_path] = state;
 }
 
 void NetworkPortalDetectorStub::NotifyObserversForTesting() {
   CaptivePortalState state;
-  if (active_network_ &&
-      portal_state_map_.count(active_network_->service_path())) {
-    state = portal_state_map_[active_network_->service_path()];
+  if (default_network_ &&
+      portal_state_map_.count(default_network_->path())) {
+    state = portal_state_map_[default_network_->path()];
   }
   FOR_EACH_OBSERVER(Observer, observers_,
-                    OnPortalDetectionCompleted(active_network_, state));
+                    OnPortalDetectionCompleted(default_network_.get(), state));
 }
 
 }  // namespace chromeos