Bug 1870807 - Amend test globals to allow checking the cookie jar. r=dom-storage-reviewers,timhuang,asuth

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

Author: jjjalkanen

js/xpconnect/src/SandboxPrivate.h

@@ -72,16 +72,20 @@ class SandboxPrivate final : public nsIGlobalObject,
     return GetWrapperPreserveColor();
   }
 
+  nsICookieJarSettings* GetCookieJarSettings() override {
+    MOZ_ASSERT(NS_IsMainThread());
+    return mCookieJarSettings;
+  }
+
   mozilla::StorageAccess GetStorageAccess() final {
     MOZ_ASSERT(NS_IsMainThread());
     if (mozilla::StaticPrefs::dom_serviceWorkers_testing_enabled()) {
       // XXX: This is a hack to workaround bug 1732159 and is not intended
       return mozilla::StorageAccess::eAllow;
     }
-    nsCOMPtr<nsICookieJarSettings> cookieJarSettings =
-        mozilla::net::CookieJarSettings::Create(mPrincipal);
+
     return mozilla::StorageAllowedForServiceWorker(mPrincipal,
-                                                   cookieJarSettings);
+                                                   mCookieJarSettings);
   }
 
   void ForgetGlobalObject(JSObject* obj) { ClearWrapper(obj); }
@@ -118,12 +122,17 @@ class SandboxPrivate final : public nsIGlobalObject,
   bool IsXPCSandbox() override { return true; }
 
  private:
-  explicit SandboxPrivate(nsIPrincipal* principal) : mPrincipal(principal) {}
+  explicit SandboxPrivate(nsIPrincipal* principal)
+      : mPrincipal(principal),
+        mCookieJarSettings(
+            mozilla::net::CookieJarSettings::Create(mPrincipal)) {}
 
   virtual ~SandboxPrivate() = default;
 
   nsCOMPtr<nsIPrincipal> mPrincipal;
 
+  nsCOMPtr<nsICookieJarSettings> mCookieJarSettings;
+
   RefPtr<JS::loader::ModuleLoaderBase> mModuleLoader;
 };
 

js/xpconnect/src/SystemGlobal.h

@@ -19,6 +19,7 @@
 
 #include "js/HeapAPI.h"
 
+class nsICookieJarSettings;
 class XPCWrappedNative;
 
 // The shared system global (used by ChromeUtils.importESModule), and also
@@ -58,6 +59,11 @@ class SystemGlobal final : public nsIGlobalObject,
     return mModuleLoader;
   }
 
+  nsICookieJarSettings* GetCookieJarSettings() override {
+    MOZ_ASSERT(NS_IsMainThread());
+    return mCookieJarSettings;
+  }
+
   mozilla::StorageAccess GetStorageAccess() final {
     MOZ_ASSERT(NS_IsMainThread());
     return mozilla::StorageAccess::eAllow;
@@ -95,6 +101,7 @@ class SystemGlobal final : public nsIGlobalObject,
 
   const nsID mAgentClusterId;
   nsCOMPtr<nsIPrincipal> mPrincipal;
+  nsCOMPtr<nsICookieJarSettings> mCookieJarSettings;
   XPCWrappedNative* mWrapper;
 
   RefPtr<JS::loader::ModuleLoaderBase> mModuleLoader;

js/xpconnect/src/XPCRuntimeService.cpp

@@ -15,6 +15,7 @@
 #include "mozilla/dom/IndexedDatabaseManager.h"
 #include "mozilla/ipc/BackgroundUtils.h"
 #include "mozilla/ipc/PBackgroundSharedTypes.h"
+#include "mozilla/net/CookieJarSettings.h"
 
 using namespace mozilla::dom;
 
@@ -24,7 +25,8 @@ NS_IMPL_ISUPPORTS(SystemGlobal, nsIXPCScriptable, nsIGlobalObject, nsIClassInfo,
 SystemGlobal::SystemGlobal()
     : mAgentClusterId(nsID::GenerateUUID()),
       mPrincipal(nsContentUtils::GetSystemPrincipal()),
-      mWrapper(nullptr){}
+      mCookieJarSettings(mozilla::net::CookieJarSettings::Create(mPrincipal)),
+      mWrapper(nullptr) {}
 // XXX(nika): It appears we don't have support for mayresolve hooks in
 // nsIXPCScriptable, and I don't really want to add it because I'd rather just
 // kill nsIXPCScriptable alltogether, so we don't use it here.
@@ -42,8 +44,7 @@ SystemGlobal::SystemGlobal()
    XPC_SCRIPTABLE_DONT_REFLECT_INTERFACE_NAMES)
 #include "xpc_map_end.h" /* This will #undef the above */
 
-          JSObject
-          * SystemGlobal::GetGlobalJSObject() {
+JSObject* SystemGlobal::GetGlobalJSObject() {
   if (mWrapper) {
     return mWrapper->GetFlatJSObject();
   }