Revert "cros: close dialog when shill detects captive portal network switched to online"

chrome/browser/chromeos/net/network_portal_notification_controller.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/chromeos/net/network_portal_notification_controller.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
@@ skipping 241 matching lines @@
   if (NetworkHandler::IsInitialized()) {
     NetworkHandler::Get()->network_state_handler()->RemoveObserver(this,
                                                                    FROM_HERE);
   }
 }
 
 void NetworkPortalNotificationController::DefaultNetworkChanged(
     const NetworkState* network) {
   if (!network)
     return;
-
-  bool network_changed = (default_network_id_ != network->guid());
-  default_network_id_ = network->guid();
-  if (!network_changed && network->connection_state() == shill::kStateOnline &&
-      dialog_) {
-    dialog_->Close();
-  }
-
   Profile* profile = GetProfileForPrimaryUser();
   extensions::NetworkingConfigService* networking_config_service =
       GetNetworkingConfigService(profile);
   if (!networking_config_service)
     return;
   networking_config_service->ResetAuthenticationResult();
 }
 
 void NetworkPortalNotificationController::OnPortalDetectionCompleted(
     const NetworkState* network,
     const NetworkPortalDetector::CaptivePortalState& state) {
   if (!IsPortalNotificationEnabled())
     return;
 
   if (!network ||
       state.status != NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_PORTAL) {
     last_network_guid_.clear();
+
+    // In browser tests we initiate fake network portal detection, but network
+    // state usually stays connected. This way, after dialog is shown, it is
+    // immediately closed. The testing check below prevents dialog from closing.
+    if (dialog_ &&
+        (!ignore_no_network_for_testing_ ||
+         state.status == NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE)) {
+      dialog_->Close();
+    }
+
     CloseNotification();
     return;
   }
 
   // Don't do anything if we're currently activating the device.
   if (MobileActivator::GetInstance()->RunningActivation())
     return;
 
   // Don't do anything if notification for |network| already was
   // displayed.
@@ skipping 126 matching lines @@
   } else {
     return CreateDefaultCaptivePortalNotification(network);
   }
 }
 
 void NetworkPortalNotificationController::OnExtensionFinishedAuthentication() {
   if (!retry_detection_callback_.is_null())
     retry_detection_callback_.Run();
 }
 
+void NetworkPortalNotificationController::SetIgnoreNoNetworkForTesting() {
+  ignore_no_network_for_testing_ = true;
+}
+
 void NetworkPortalNotificationController::CloseDialog() {
   if (dialog_)
     dialog_->Close();
 }
 
 const NetworkPortalWebDialog*
 NetworkPortalNotificationController::GetDialogForTesting() const {
   return dialog_;
 }
 
 }  // namespace chromeos