Bug 1559340 - Make sure NetworkConnectivityService::Init() only gets …

…called once r=michal Differential Revision: https://phabricator.services.mozilla.com/D35000 --HG-- extra : moz-landing-system : lando
dothq · Jun 24, 2019 · 8c623c2 · 8c623c2
1 parent cff8fe1
commit 8c623c2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/netwerk/base/NetworkConnectivityService.h b/netwerk/base/NetworkConnectivityService.h
@@ -25,13 +25,13 @@ class NetworkConnectivityService : public nsINetworkConnectivityService,
   NS_DECL_NSISTREAMLISTENER
   NS_DECL_NSIREQUESTOBSERVER
 
-  nsresult Init();
   static already_AddRefed<NetworkConnectivityService> GetSingleton();
 
  private:
   NetworkConnectivityService() = default;
   virtual ~NetworkConnectivityService() = default;
 
+  nsresult Init();
   // Calls all the check methods
   void PerformChecks();
 

diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp
@@ -299,9 +299,9 @@ nsresult nsIOService::InitializeCaptivePortalService() {
         ->Initialize();
   }
 
+  // Instantiate and initialize the service
   RefPtr<NetworkConnectivityService> ncs =
       NetworkConnectivityService::GetSingleton();
-  ncs->Init();
 
   return NS_OK;
 }