Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / net / network_portal_detector_test_impl.cc

diff --git a/src/chrome/browser/chromeos/net/network_portal_detector_test_impl.cc b/src/chrome/browser/chromeos/net/network_portal_detector_test_impl.cc
index ca2980a..fafada0 100644 (file)
--- a/src/chrome/browser/chromeos/net/network_portal_detector_test_impl.cc
+++ b/src/chrome/browser/chromeos/net/network_portal_detector_test_impl.cc
@@ -15,27 +15,30 @@ NetworkPortalDetectorTestImpl::NetworkPortalDetectorTestImpl()
 NetworkPortalDetectorTestImpl::~NetworkPortalDetectorTestImpl() {
 }
 
-void NetworkPortalDetectorTestImpl::SetDefaultNetworkPathForTesting(
-    const std::string& service_path) {
-  if (service_path.empty())
+void NetworkPortalDetectorTestImpl::SetDefaultNetworkForTesting(
+    const std::string& guid) {
+  DVLOG(1) << "SetDefaultNetworkForTesting: " << guid;
+  if (guid.empty()) {
     default_network_.reset();
-  else
-    default_network_.reset(new NetworkState(service_path));
+  } else {
+    default_network_.reset(new NetworkState("/service/" + guid));
+    default_network_->SetGuid(guid);
+  }
 }
 
 void NetworkPortalDetectorTestImpl::SetDetectionResultsForTesting(
-    const std::string& service_path,
+    const std::string& guid,
     const CaptivePortalState& state) {
-  if (!service_path.empty())
-    portal_state_map_[service_path] = state;
+  DVLOG(1) << "SetDetectionResultsForTesting: " << guid << " = "
+           << NetworkPortalDetector::CaptivePortalStatusString(state.status);
+  if (!guid.empty())
+    portal_state_map_[guid] = state;
 }
 
 void NetworkPortalDetectorTestImpl::NotifyObserversForTesting() {
   CaptivePortalState state;
-  if (default_network_ &&
-      portal_state_map_.count(default_network_->path())) {
-    state = portal_state_map_[default_network_->path()];
-  }
+  if (default_network_ && portal_state_map_.count(default_network_->guid()))
+    state = portal_state_map_[default_network_->guid()];
   FOR_EACH_OBSERVER(Observer, observers_,
                     OnPortalDetectionCompleted(default_network_.get(), state));
 }
@@ -49,14 +52,12 @@ void NetworkPortalDetectorTestImpl::AddAndFireObserver(Observer* observer) {
   AddObserver(observer);
   if (!observer)
     return;
-  if (!default_network_ ||
-      !portal_state_map_.count(default_network_->path())) {
+  if (!default_network_ || !portal_state_map_.count(default_network_->guid())) {
     observer->OnPortalDetectionCompleted(default_network_.get(),
                                          CaptivePortalState());
   } else {
     observer->OnPortalDetectionCompleted(
-        default_network_.get(),
-        portal_state_map_[default_network_->path()]);
+        default_network_.get(), portal_state_map_[default_network_->guid()]);
   }
 }
 
@@ -67,10 +68,14 @@ void NetworkPortalDetectorTestImpl::RemoveObserver(Observer* observer) {
 
 NetworkPortalDetector::CaptivePortalState
 NetworkPortalDetectorTestImpl::GetCaptivePortalState(
-    const std::string& service_path) {
-  CaptivePortalStateMap::iterator it = portal_state_map_.find(service_path);
-  if (it == portal_state_map_.end())
+    const std::string& guid) {
+  CaptivePortalStateMap::iterator it = portal_state_map_.find(guid);
+  if (it == portal_state_map_.end()) {
+    DVLOG(2) << "GetCaptivePortalState Not found: " << guid;
     return CaptivePortalState();
+  }
+  DVLOG(2) << "GetCaptivePortalState: " << guid << " = "
+           << CaptivePortalStatusString(it->second.status);
   return it->second;
 }