Backed out changeset 40079b294d34 (bug 1800603) for causing Xpcshell failures in test_ext_captivePortal.js. CLOSED TREE

netwerk/base/CaptivePortalService.cpp

@@ -65,10 +65,6 @@ nsresult CaptivePortalService::PerformCheck() {
   if (AppShutdown::IsInOrBeyond(ShutdownPhase::AppShutdownConfirmed)) {
     return NS_ERROR_ILLEGAL_DURING_SHUTDOWN;
   }
-  if (!mCanUseJS) {
-    return NS_ERROR_NOT_INITIALIZED;
-  }
-
   MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default);
   nsresult rv;
   if (!mCaptivePortalDetector) {
@@ -137,7 +133,6 @@ nsresult CaptivePortalService::Initialize() {
     observerService->AddObserver(this, kAbortCaptivePortalLoginEvent, true);
     observerService->AddObserver(this, kCaptivePortalLoginSuccessEvent, true);
     observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, true);
-    observerService->AddObserver(this, "app-startup", true);
   }
 
   LOG(("Initialized CaptivePortalService\n"));
@@ -339,9 +334,6 @@ CaptivePortalService::Observe(nsISupports* aSubject, const char* aTopic,
   } else if (!strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) {
     Stop();
     return NS_OK;
-  } else if (!strcmp(aTopic, "app-startup")) {
-    mCanUseJS = true;
-    return NS_OK;
   }
 
   // Send notification so that the captive portal state is mirrored in the

netwerk/base/CaptivePortalService.h

@@ -58,7 +58,6 @@ class CaptivePortalService : public nsICaptivePortalService,
   bool mInitialized{false};
   bool mRequestInProgress{false};
   bool mEverBeenCaptive{false};
-  bool mCanUseJS{false};
 
   uint32_t mDelay{kDefaultInterval};
   int32_t mSlackCount{0};