From 46be6f9ea370f9d68a65630a26243275d0dca753 Mon Sep 17 00:00:00 2001
From: Tom Ritter <tom@mozilla.com>
Date: Sat, 14 Sep 2019 03:36:14 +0000
Subject: [PATCH] Bug 1577284 - Refactor out a data: URI in loadProcessScript
 r=kmag

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

--HG--
extra : moz-landing-system : lando
---
 .../content/test/performance/browser_startup_content.js     | 2 +-
 .../components/extensions/extensionProcessScriptLoader.js   | 6 ++++++
 toolkit/components/extensions/moz.build                     | 1 +
 toolkit/mozapps/extensions/AddonManager.jsm                 | 2 +-
 4 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 toolkit/components/extensions/extensionProcessScriptLoader.js
 mode change 100644 => 100755 toolkit/components/extensions/moz.build

diff --git a/browser/base/content/test/performance/browser_startup_content.js b/browser/base/content/test/performance/browser_startup_content.js
index bb4aee2ca44f..39b049a0a595 100644
--- a/browser/base/content/test/performance/browser_startup_content.js
+++ b/browser/base/content/test/performance/browser_startup_content.js
@@ -77,7 +77,7 @@ const whitelist = {
   processScripts: new Set([
     "chrome://global/content/process-content.js",
     "resource:///modules/ContentObservers.js",
-    "data:,ChromeUtils.import('resource://gre/modules/ExtensionProcessScript.jsm')",
+    "resource://gre/modules/extensionProcessScriptLoader.js",
     "resource://devtools/client/jsonview/converter-observer.js",
     "resource://gre/modules/WebRequestContent.js",
   ]),
diff --git a/toolkit/components/extensions/extensionProcessScriptLoader.js b/toolkit/components/extensions/extensionProcessScriptLoader.js
new file mode 100644
index 000000000000..855dfc210e54
--- /dev/null
+++ b/toolkit/components/extensions/extensionProcessScriptLoader.js
@@ -0,0 +1,6 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+"use strict";
+
+ChromeUtils.import("resource://gre/modules/ExtensionProcessScript.jsm");
diff --git a/toolkit/components/extensions/moz.build b/toolkit/components/extensions/moz.build
old mode 100644
new mode 100755
index 26edb1e475d9..f2ef600997a1
--- a/toolkit/components/extensions/moz.build
+++ b/toolkit/components/extensions/moz.build
@@ -20,6 +20,7 @@ EXTRA_JS_MODULES += [
     'ExtensionPermissions.jsm',
     'ExtensionPreferencesManager.jsm',
     'ExtensionProcessScript.jsm',
+    'extensionProcessScriptLoader.js',
     'ExtensionSettingsStore.jsm',
     'ExtensionShortcuts.jsm',
     'ExtensionStorage.jsm',
diff --git a/toolkit/mozapps/extensions/AddonManager.jsm b/toolkit/mozapps/extensions/AddonManager.jsm
index 7ed01f8b78d4..37535e84a35d 100644
--- a/toolkit/mozapps/extensions/AddonManager.jsm
+++ b/toolkit/mozapps/extensions/AddonManager.jsm
@@ -87,7 +87,7 @@ XPCOMUtils.defineLazyPreferenceGetter(
 // since it needs to be able to track things like new frameLoader globals that
 // are created before other framework code has been initialized.
 Services.ppmm.loadProcessScript(
-  "data:,ChromeUtils.import('resource://gre/modules/ExtensionProcessScript.jsm')",
+  "resource://gre/modules/extensionProcessScriptLoader.js",
   true
 );