Backed out changeset 498c23b2d670 (bug 1883143) for causing failures in nsContentSecurityUtils.cpp CLOSED TREE

2024-03-05 13:19:07 -05:00 · 2024-03-05 13:19:07 -05:00 · 912388edd2
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@ -3024,6 +3024,3 @@ pref("browser.mailto.dualPrompt.os", false);
 pref("browser.mailto.prompt.os", true);

 pref("browser.backup.enabled", false);
-
-// Pref to enable the new profiles
-pref("browser.profiles.enabled", false);
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@ -717,7 +717,6 @@ var gInitialPages = [
  "about:welcome",
  "about:welcomeback",
  "chrome://browser/content/blanktab.html",
-  "about:profilemanager",
 ];

 function isInitialPage(url) {
--- a/browser/components/BrowserGlue.sys.mjs
+++ b/browser/components/BrowserGlue.sys.mjs
@ -674,17 +674,6 @@ let JSWINDOWACTORS = {
    allFrames: true,
  },

-  Profiles: {
-    parent: {
-      esModuleURI: "resource:///actors/ProfilesParent.sys.mjs",
-    },
-    child: {
-      esModuleURI: "resource:///actors/ProfilesChild.sys.mjs",
-    },
-    matches: ["about:profilemanager"],
-    enablePreference: "browser.profiles.enabled",
-  },
-
  Prompt: {
    parent: {
      esModuleURI: "resource:///actors/PromptParent.sys.mjs",
--- a/browser/components/about/AboutRedirector.cpp
+++ b/browser/components/about/AboutRedirector.cpp
@ -163,10 +163,6 @@ static const RedirEntry kRedirMap[] = {
    {"ion", "chrome://browser/content/ion.html",
     nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT |
         nsIAboutModule::IS_SECURE_CHROME_UI},
-    {"profilemanager", "chrome://browser/content/profiles/profiles.html",
-     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
-         nsIAboutModule::URI_MUST_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT |
-         nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS},
 };

 static nsAutoCString GetAboutModuleName(nsIURI* aURI) {
--- a/browser/components/about/components.conf
+++ b/browser/components/about/components.conf
@ -25,7 +25,6 @@ pages = [
    'preferences',
    'privatebrowsing',
    'protections',
-    'profilemanager',
    'profiling',
    'reader',
    'restartrequired',
--- a/browser/components/moz.build
+++ b/browser/components/moz.build
@ -51,7 +51,6 @@ DIRS += [
    "pocket",
    "preferences",
    "privatebrowsing",
-    "profiles",
    "prompts",
    "protections",
    "protocolhandler",
--- a/browser/components/profiles/ProfilesChild.sys.mjs
+++ b/browser/components/profiles/ProfilesChild.sys.mjs
@ -1,5 +0,0 @@
-/* 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/. */
-
-export class ProfilesChild extends JSWindowActorParent {}
--- a/browser/components/profiles/ProfilesParent.sys.mjs
+++ b/browser/components/profiles/ProfilesParent.sys.mjs
@ -1,5 +0,0 @@
-/* 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/. */
-
-export class ProfilesParent extends JSWindowActorParent {}
--- a/browser/components/profiles/content/profiles.html
+++ b/browser/components/profiles/content/profiles.html
@ -1,16 +0,0 @@
-<!-- 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/. -->
-<!DOCTYPE html>
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  role="document"
-  class="system-font-size"
->
-  <head>
-    <meta charset="utf-8" />
-  </head>
-  <body>
-    <h1>Hello world - New Profiles</h1>
-  </body>
-</html>
--- a/browser/components/profiles/jar.mn
+++ b/browser/components/profiles/jar.mn
@ -1,6 +0,0 @@
-# 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/.
-
-browser.jar:
-    content/browser/profiles/profiles.html (content/profiles.html)
--- a/browser/components/profiles/moz.build
+++ b/browser/components/profiles/moz.build
@ -1,15 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# 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/.
-
-JAR_MANIFESTS += ["jar.mn"]
-
-FINAL_TARGET_FILES.actors += [
-    "ProfilesChild.sys.mjs",
-    "ProfilesParent.sys.mjs",
-]
-
-with Files("**"):
-    BUG_COMPONENT = ("Firefox", "Profiles")