CrOS: Remove NetworkPortalDetectorImpl from GaiaScreenHandler

The original intention here has been broken for a while. Moving forward,
the global detector will be better to use anyway. See issue for details.

Bug: 1133041
Change-Id: Icaee3521c6974d89ce67ce5b220df42442e3cb40
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2437701
Commit-Queue: Roman Sorokin [CET] <rsorokin@chromium.org>
Reviewed-by: Roman Sorokin [CET] <rsorokin@chromium.org>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
Cr-Commit-Position: refs/heads/master@{#812005}

chrome/browser/chromeos/net/network_portal_detector_impl.cc

@@ -125,8 +125,6 @@ NetworkPortalDetectorImpl::NetworkPortalDetectorImpl(
   }
   captive_portal_detector_.reset(new CaptivePortalDetector(loader_factory));
 
-  portal_test_url_ = GURL(CaptivePortalDetector::kDefaultURL);
-
   registrar_.Add(this, chrome::NOTIFICATION_AUTH_SUPPLIED,
                  content::NotificationService::AllSources());
   registrar_.Add(this, chrome::NOTIFICATION_AUTH_CANCELLED,
@@ -356,11 +354,9 @@ void NetworkPortalDetectorImpl::StartAttempt() {
   state_ = STATE_CHECKING_FOR_PORTAL;
   attempt_start_time_ = NowTicks();
 
-  DCHECK(portal_test_url_.is_valid());
-  NET_LOG(EVENT) << "Starting captive portal detection with URL: "
-                 << portal_test_url_;
+  NET_LOG(EVENT) << "Starting captive portal detection.";
   captive_portal_detector_->DetectCaptivePortal(
-      portal_test_url_,
+      GURL(CaptivePortalDetector::kDefaultURL),
       base::BindOnce(&NetworkPortalDetectorImpl::OnAttemptCompleted,
                      weak_factory_.GetWeakPtr()),
       NO_TRAFFIC_ANNOTATION_YET);

chrome/browser/chromeos/net/network_portal_detector_impl.h

@@ -62,11 +62,6 @@ class NetworkPortalDetectorImpl : public NetworkPortalDetector,
       network::mojom::URLLoaderFactory* loader_factory_for_testing = nullptr);
   ~NetworkPortalDetectorImpl() override;
 
-  // Set the URL to be tested for portal state.
-  void set_portal_test_url(const GURL& portal_test_url) {
-    portal_test_url_ = portal_test_url;
-  }
-
  private:
   friend class ::NetworkingConfigTest;
   friend class NetworkPortalDetectorImplTest;
@@ -220,10 +215,6 @@ class NetworkPortalDetectorImpl : public NetworkPortalDetector,
   // Reference to a SharedURLLoaderFactory used to detect portals.
   scoped_refptr<network::SharedURLLoaderFactory> shared_url_loader_factory_;
 
-  // URL that returns a 204 response code when connected to the Internet. Used
-  // by tests.
-  GURL portal_test_url_;
-
   // Detector for checking default network for a portal state.
   std::unique_ptr<captive_portal::CaptivePortalDetector>
       captive_portal_detector_;

chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc

@@ -45,7 +45,6 @@
 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager_util.h"
-#include "chrome/browser/chromeos/net/network_portal_detector_impl.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_network_configuration_updater.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
@@ -74,6 +73,7 @@
 #include "chromeos/login/auth/saml_password_attributes.h"
 #include "chromeos/login/auth/user_context.h"
 #include "chromeos/network/onc/certificate_scope.h"
+#include "chromeos/network/portal_detector/network_portal_detector.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "chromeos/strings/grit/chromeos_strings.h"
 #include "components/login/localized_values_builder.h"
@@ -107,8 +107,6 @@ namespace {
 
 const char kAuthIframeParentName[] = "signin-frame";
 
-const char kRestrictiveProxyURL[] = "https://www.google.com/generate_204";
-
 const char kEndpointGen[] = "1.0";
 
 const char kOAUTHCodeCookie[] = "oauth_code";
@@ -345,8 +343,8 @@ GaiaScreenHandler::GaiaScreenHandler(
 }
 
 GaiaScreenHandler::~GaiaScreenHandler() {
-  if (network_portal_detector_)
-    network_portal_detector_->RemoveObserver(this);
+  if (network_portal_detector::IsInitialized())
+    network_portal_detector::GetInstance()->RemoveObserver(this);
   if (is_security_token_pin_enabled_)
     GetLoginScreenPinDialogManager()->RemovePinDialogHost(this);
 }
@@ -360,13 +358,8 @@ void GaiaScreenHandler::MaybePreloadAuthExtension() {
 
   VLOG(1) << "MaybePreloadAuthExtension";
 
-  if (!network_portal_detector_) {
-    NetworkPortalDetectorImpl* detector = new NetworkPortalDetectorImpl();
-    detector->set_portal_test_url(GURL(kRestrictiveProxyURL));
-    network_portal_detector_.reset(detector);
-    network_portal_detector_->AddObserver(this);
-    network_portal_detector_->Enable(true);
-  }
+  if (network_portal_detector::IsInitialized())
+    network_portal_detector::GetInstance()->AddAndFireObserver(this);
 
   // If cookies clearing was initiated or |dns_clear_task_running_| then auth
   // extension showing has already been initiated and preloading is pointless.

chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h

@@ -19,7 +19,6 @@
 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
 #include "chrome/browser/ui/webui/chromeos/login/saml_challenge_key_handler.h"
 #include "chromeos/components/security_token_pin/constants.h"
-#include "chromeos/network/portal_detector/network_portal_detector.h"
 #include "components/user_manager/user_type.h"
 #include "net/base/net_errors.h"
 #include "net/cookies/canonical_cookie.h"
@@ -412,7 +411,6 @@ class GaiaScreenHandler : public BaseScreenHandler,
   NetworkPortalDetector::CaptivePortalStatus captive_portal_status_ =
       NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE;
 
-  std::unique_ptr<NetworkPortalDetector> network_portal_detector_;
   bool disable_restrictive_proxy_check_for_test_ = false;
 
   // Non-owning ptr to SigninScreenHandler instance. Should not be used