Bug 1502774 - Part 3: Remove nsAuthModule r=valentin

Depends on D10026

Differential Revision: https://phabricator.services.mozilla.com/D10027

--HG--
rename : extensions/auth/nsAuthFactory.cpp => extensions/auth/nsIAuthModule.cpp
extra : moz-landing-system : lando

extensions/auth/moz.build

@@ -5,13 +5,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 UNIFIED_SOURCES += [
-    'nsAuthFactory.cpp',
     'nsAuthGSSAPI.cpp',
 ]
 
 SOURCES += [
     'nsAuthSASL.cpp',
     'nsHttpNegotiateAuth.cpp', # contains constants whose names conflict with constants in other files
+    'nsIAuthModule.cpp',       # includes windows.h recursively which conflicts with TimeStamp.h
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':

extensions/auth/nsIAuthModule.cpp

@@ -2,29 +2,18 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "mozilla/ModuleUtils.h"
-#include "nsCRT.h"
 #include "nsIAuthModule.h"
-
-//-----------------------------------------------------------------------------
-#include "nsAuthGSSAPI.h"
 #if defined( USE_SSPI )
 #include "nsAuthSSPI.h"
 #else
 #include "nsAuthSambaNTLM.h"
 #endif
+#include "nsCRT.h"
+#include "nsAuthGSSAPI.h"
 #include "nsAuthSASL.h"
 #include "nsNTLMAuthModule.h"
 #include "nsNSSComponent.h"
 
-static const mozilla::Module::CIDEntry kAuthCIDs[] = {
-  { nullptr }
-};
-
-static const mozilla::Module::ContractIDEntry kAuthContracts[] = {
-  { nullptr }
-};
-
 // static
 already_AddRefed<nsIAuthModule>
 nsIAuthModule::CreateInstance(const char* aType)
@@ -73,30 +62,4 @@ nsIAuthModule::CreateInstance(const char* aType)
   return auth.forget();
 }
 
-//-----------------------------------------------------------------------------
 mozilla::LazyLogModule gNegotiateLog("negotiateauth");
-
-// setup nspr logging ...
-static nsresult
-InitNegotiateAuth()
-{
-  return NS_OK;
-}
-
-static void
-DestroyNegotiateAuth()
-{
-  nsAuthGSSAPI::Shutdown();
-}
-
-static const mozilla::Module kAuthModule = {
-  mozilla::Module::kVersion,
-  kAuthCIDs,
-  kAuthContracts,
-  nullptr,
-  nullptr,
-  InitNegotiateAuth,
-  DestroyNegotiateAuth
-};
-
-NSMODULE_DEFN(nsAuthModule) = &kAuthModule;

netwerk/build/moz.build

@@ -17,6 +17,7 @@ include('/ipc/chromium/chromium-config.mozbuild')
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
+    '/extensions/auth',
     '/netwerk/base',
     '/netwerk/cache',
     '/netwerk/dns',

netwerk/build/nsNetModule.cpp

@@ -39,6 +39,7 @@
 #include "mozilla/net/BackgroundChannelRegistrar.h"
 #include "mozilla/net/NeckoChild.h"
 #include "RedirectChannelRegistrar.h"
+#include "nsAuthGSSAPI.h"
 
 #include "nsNetCID.h"
 
@@ -620,6 +621,8 @@ static void nsNetShutdown()
 
     mozilla::net::BackgroundChannelRegistrar::Shutdown();
 
+    nsAuthGSSAPI::Shutdown();
+
     delete gNetSniffers;
     gNetSniffers = nullptr;
     delete gDataSniffers;