Bug 1547114 - Part 7: Get rid of nsCookieModule.h/cpp; r=baku

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

--HG--
extra : moz-landing-system : lando

Author: Ehsan Akhgari

extensions/cookie/components.conf

@@ -4,12 +4,6 @@
 # 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/.
 
-Headers = [
-    '/extensions/cookie/nsCookieModule.h',
-]
-
-UnloadFunc = 'mozilla::CookieModuleDtor'
-
 Classes = [
     {
         'cid': '{4f6b5e00-0c36-11d5-a535-0010a401eb10}',

extensions/cookie/moz.build

@@ -11,7 +11,6 @@ EXPORTS += [
 ]
 
 UNIFIED_SOURCES += [
-    'nsCookieModule.cpp',
     'nsCookiePermission.cpp',
     'nsPermission.cpp',
     'nsPermissionManager.cpp',

extensions/cookie/nsCookieModule.cpp

@@ -25,6 +25,7 @@
 #include "nsNetCID.h"
 #include "prtime.h"
 #include "mozilla/StaticPtr.h"
+#include "mozilla/ClearOnShutdown.h"
 #include "nsContentUtils.h"
 
 /****************************************************************
@@ -47,13 +48,11 @@ NS_IMPL_ISUPPORTS(nsCookiePermission, nsICookiePermission)
 already_AddRefed<nsICookiePermission> nsCookiePermission::GetOrCreate() {
   if (!gSingleton) {
     gSingleton = new nsCookiePermission();
+    ClearOnShutdown(&gSingleton);
   }
   return do_AddRef(gSingleton);
 }
 
-// static
-void nsCookiePermission::Shutdown() { gSingleton = nullptr; }
-
 bool nsCookiePermission::Init() {
   // Initialize nsIPermissionManager and fetch relevant prefs. This is only
   // required for some methods on nsICookiePermission, so it should be done

extensions/cookie/nsCookieModule.h

@@ -16,7 +16,6 @@ class nsCookiePermission final : public nsICookiePermission {
 
   // Singleton accessor
   static already_AddRefed<nsICookiePermission> GetOrCreate();
-  static void Shutdown();
 
   bool Init();