s without a tab assigned. That are most likely browsers
-// that preload the new tab page.
-function waitForSomeTabToLoad() {
- return BrowserTestUtils.firstBrowserLoaded(window, true, browser => {
- let tab = gBrowser.getTabForBrowser(browser);
- return !!tab;
- });
-}
-
-/**
- * Ensure the Mixed Content Blocker is enabled.
- */
-add_task(async function test_initialize() {
- await SpecialPowers.pushPrefEnv({
- set: [
- ["security.mixed_content.block_active_content", true],
- // We need to disable the dFPI heuristic. So, we won't have unnecessary
- // 3rd party cookie permission that could affect following tests because
- // it will create a permission icon on the URL bar.
- ["privacy.restrict3rdpartystorage.heuristic.recently_visited", false],
- ],
- });
-});
-
-/**
- * 1. - Load a html page which has mixed content
- * - Doorhanger to disable protection appears - we disable it
- * - Load a subpage from the same origin in a new tab simulating a click
- * - Doorhanger should >> NOT << appear anymore!
- */
-add_task(async function test_same_origin() {
- await doTest(
- HTTPS_TEST_ROOT_1 + "file_bug906190_1.html",
- HTTPS_TEST_ROOT_1 + "file_bug906190_2.html",
- async function () {
- // The doorhanger should appear but activeBlocked should be >> NOT << true,
- // because our decision of disabling the mixed content blocker is persistent
- // across tabs.
- await assertMixedContentBlockingState(gBrowser, {
- activeLoaded: true,
- activeBlocked: false,
- passiveLoaded: false,
- });
-
- await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async () => {
- Assert.equal(
- content.document.getElementById("mctestdiv").innerHTML,
- "Mixed Content Blocker disabled",
- "OK: Executed mixed script"
- );
- });
- }
- );
-});
-
-/**
- * 2. - Load a html page which has mixed content
- * - Doorhanger to disable protection appears - we disable it
- * - Load a new page from a different origin in a new tab simulating a click
- * - Doorhanger >> SHOULD << appear again!
- */
-add_task(async function test_different_origin() {
- await doTest(
- HTTPS_TEST_ROOT_1 + "file_bug906190_2.html",
- HTTPS_TEST_ROOT_2 + "file_bug906190_2.html",
- async function () {
- // The doorhanger should appear and activeBlocked should be >> TRUE <<,
- // because our decision of disabling the mixed content blocker should only
- // persist if pages are from the same domain.
- await assertMixedContentBlockingState(gBrowser, {
- activeLoaded: false,
- activeBlocked: true,
- passiveLoaded: false,
- });
-
- await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async () => {
- Assert.equal(
- content.document.getElementById("mctestdiv").innerHTML,
- "Mixed Content Blocker enabled",
- "OK: Blocked mixed script"
- );
- });
- }
- );
-});
-
-/**
- * 3. - Load a html page which has mixed content
- * - Doorhanger to disable protection appears - we disable it
- * - Load a new page from the same origin in a new tab simulating a click
- * - Redirect to another page from the same origin using meta-refresh
- * - Doorhanger should >> NOT << appear again!
- */
-add_task(async function test_same_origin_metarefresh_same_origin() {
- // file_bug906190_3_4.html redirects to page test1.example.com/* using meta-refresh
- await doTest(
- HTTPS_TEST_ROOT_1 + "file_bug906190_1.html",
- HTTPS_TEST_ROOT_1 + "file_bug906190_3_4.html",
- async function () {
- // The doorhanger should appear but activeBlocked should be >> NOT << true!
- await assertMixedContentBlockingState(gBrowser, {
- activeLoaded: true,
- activeBlocked: false,
- passiveLoaded: false,
- });
-
- await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async () => {
- Assert.equal(
- content.document.getElementById("mctestdiv").innerHTML,
- "Mixed Content Blocker disabled",
- "OK: Executed mixed script"
- );
- });
- },
- true
- );
-});
-
-/**
- * 4. - Load a html page which has mixed content
- * - Doorhanger to disable protection appears - we disable it
- * - Load a new page from the same origin in a new tab simulating a click
- * - Redirect to another page from a different origin using meta-refresh
- * - Doorhanger >> SHOULD << appear again!
- */
-add_task(async function test_same_origin_metarefresh_different_origin() {
- await doTest(
- HTTPS_TEST_ROOT_2 + "file_bug906190_1.html",
- HTTPS_TEST_ROOT_2 + "file_bug906190_3_4.html",
- async function () {
- // The doorhanger should appear and activeBlocked should be >> TRUE <<.
- await assertMixedContentBlockingState(gBrowser, {
- activeLoaded: false,
- activeBlocked: true,
- passiveLoaded: false,
- });
-
- await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async () => {
- Assert.equal(
- content.document.getElementById("mctestdiv").innerHTML,
- "Mixed Content Blocker enabled",
- "OK: Blocked mixed script"
- );
- });
- },
- true
- );
-});
-
-/**
- * 5. - Load a html page which has mixed content
- * - Doorhanger to disable protection appears - we disable it
- * - Load a new page from the same origin in a new tab simulating a click
- * - Redirect to another page from the same origin using 302 redirect
- */
-add_task(async function test_same_origin_302redirect_same_origin() {
- // the sjs files returns a 302 redirect- note, same origins
- await doTest(
- HTTPS_TEST_ROOT_1 + "file_bug906190_1.html",
- HTTPS_TEST_ROOT_1 + "file_bug906190.sjs",
- async function () {
- // The doorhanger should appear but activeBlocked should be >> NOT << true.
- // Currently it is >> TRUE << - see follow up bug 914860
- ok(
- !gIdentityHandler._identityBox.classList.contains("mixedActiveBlocked"),
- "OK: Mixed Content is NOT being blocked"
- );
-
- await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async () => {
- Assert.equal(
- content.document.getElementById("mctestdiv").innerHTML,
- "Mixed Content Blocker disabled",
- "OK: Executed mixed script"
- );
- });
- }
- );
-});
-
-/**
- * 6. - Load a html page which has mixed content
- * - Doorhanger to disable protection appears - we disable it
- * - Load a new page from the same origin in a new tab simulating a click
- * - Redirect to another page from a different origin using 302 redirect
- */
-add_task(async function test_same_origin_302redirect_different_origin() {
- // the sjs files returns a 302 redirect - note, different origins
- await doTest(
- HTTPS_TEST_ROOT_2 + "file_bug906190_1.html",
- HTTPS_TEST_ROOT_2 + "file_bug906190.sjs",
- async function () {
- // The doorhanger should appear and activeBlocked should be >> TRUE <<.
- await assertMixedContentBlockingState(gBrowser, {
- activeLoaded: false,
- activeBlocked: true,
- passiveLoaded: false,
- });
-
- await SpecialPowers.spawn(gBrowser.selectedBrowser, [], async () => {
- Assert.equal(
- content.document.getElementById("mctestdiv").innerHTML,
- "Mixed Content Blocker enabled",
- "OK: Blocked mixed script"
- );
- });
- }
- );
-});
-
-/**
- * 7. - Test memory leak issue on redirection error. See Bug 1269426.
- */
-add_task(async function test_bad_redirection() {
- // the sjs files returns a 302 redirect - note, different origins
- await doTest(
- HTTPS_TEST_ROOT_2 + "file_bug906190_1.html",
- HTTPS_TEST_ROOT_2 + "file_bug906190.sjs?bad-redirection=1",
- function () {
- // Nothing to do. Just see if memory leak is reported in the end.
- ok(true, "Nothing to do");
- }
- );
-});
diff --git a/browser/base/content/test/siteIdentity/browser_mixed_content_cert_override.js b/browser/base/content/test/siteIdentity/browser_mixed_content_cert_override.js
index 99f4efce9c20..6ef44e1c9c3b 100644
--- a/browser/base/content/test/siteIdentity/browser_mixed_content_cert_override.js
+++ b/browser/base/content/test/siteIdentity/browser_mixed_content_cert_override.js
@@ -45,12 +45,6 @@ add_task(async function () {
await loadBadCertPage(MIXED_CONTENT_URL);
checkIdentityPopup("security-warning.svg");
- // check that the crossed out icon is shown when disabling mixed content protection
- gIdentityHandler.disableMixedContentProtection();
- await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser);
-
- checkIdentityPopup("security-broken.svg");
-
// check that a warning is shown even without mixed content
BrowserTestUtils.startLoadingURIString(
gBrowser.selectedBrowser,
diff --git a/browser/base/content/test/siteIdentity/browser_mixed_content_with_navigation.js b/browser/base/content/test/siteIdentity/browser_mixed_content_with_navigation.js
index dd8280b20498..a479d9cf5591 100644
--- a/browser/base/content/test/siteIdentity/browser_mixed_content_with_navigation.js
+++ b/browser/base/content/test/siteIdentity/browser_mixed_content_with_navigation.js
@@ -22,7 +22,7 @@ const kTestcases = [
expectedIdentityMode: "mixedDisplayContent",
},
{
- uri: kBaseURI + "file_bug1045809_1.html",
+ uri: kBaseURI + "file_mixedActiveContent_1.html",
expectErrorPage: false,
expectedIdentityMode: "mixedActiveBlocked",
},
diff --git a/browser/base/content/test/siteIdentity/browser_mixedcontent_securityflags.js b/browser/base/content/test/siteIdentity/browser_mixedcontent_securityflags.js
index 3e39426c51f5..5bb8f99fd649 100644
--- a/browser/base/content/test/siteIdentity/browser_mixedcontent_securityflags.js
+++ b/browser/base/content/test/siteIdentity/browser_mixedcontent_securityflags.js
@@ -7,8 +7,6 @@
// loaded) we load the page and check the flags.
// * We change the about:config prefs (mixed active blocked, mixed display
// blocked), reload the page, and check the flags again.
-// * We override protection so all mixed content can load and check the
-// flags again.
const TEST_URI =
getRootDirectory(gTestPath).replace(
@@ -56,16 +54,3 @@ add_task(async function blockMixedActiveContentTest() {
passiveLoaded: false,
});
});
-
-add_task(async function overrideMCB() {
- // Disable mixed content blocking (reloads page) and retest
- let { gIdentityHandler } = gTestBrowser.ownerGlobal;
- gIdentityHandler.disableMixedContentProtection();
- await BrowserTestUtils.browserLoaded(gTestBrowser);
-
- await assertMixedContentBlockingState(gTestBrowser, {
- activeLoaded: true,
- activeBlocked: false,
- passiveLoaded: true,
- });
-});
diff --git a/browser/base/content/test/siteIdentity/file_bug822367_1.html b/browser/base/content/test/siteIdentity/file_bug822367_1.html
deleted file mode 100644
index a6e3fafc23fe..000000000000
--- a/browser/base/content/test/siteIdentity/file_bug822367_1.html
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
- Test 1 for Bug 822367
-
-
-
-
-
-
diff --git a/browser/base/content/test/siteIdentity/file_bug822367_1.js b/browser/base/content/test/siteIdentity/file_bug822367_1.js
deleted file mode 100644
index e4b5fb86c6ca..000000000000
--- a/browser/base/content/test/siteIdentity/file_bug822367_1.js
+++ /dev/null
@@ -1 +0,0 @@
-document.getElementById("p1").innerHTML = "hello";
diff --git a/browser/base/content/test/siteIdentity/file_bug822367_2.html b/browser/base/content/test/siteIdentity/file_bug822367_2.html
deleted file mode 100644
index fe56ee213093..000000000000
--- a/browser/base/content/test/siteIdentity/file_bug822367_2.html
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
- Test 2 for Bug 822367 - Mixed Display
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/browser/base/content/test/siteIdentity/file_bug902156.js b/browser/base/content/test/siteIdentity/file_bug902156.js
deleted file mode 100644
index 01ef4073fb88..000000000000
--- a/browser/base/content/test/siteIdentity/file_bug902156.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- * Once the mixed content blocker is disabled for the page, this scripts loads
- * and updates the text inside the div container.
- */
-document.getElementById("mctestdiv").innerHTML =
- "Mixed Content Blocker disabled";
diff --git a/browser/base/content/test/siteIdentity/file_bug902156_1.html b/browser/base/content/test/siteIdentity/file_bug902156_1.html
deleted file mode 100644
index 4cac7cfb9320..000000000000
--- a/browser/base/content/test/siteIdentity/file_bug902156_1.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
- Test 1 for Bug 902156
-
-
- Mixed Content Blocker enabled
-
-
-
diff --git a/browser/base/content/test/siteIdentity/file_bug902156_2.html b/browser/base/content/test/siteIdentity/file_bug902156_2.html
deleted file mode 100644
index c815a09a9371..000000000000
--- a/browser/base/content/test/siteIdentity/file_bug902156_2.html
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
- Test 2 for Bug 902156
-
-
- Mixed Content Blocker enabled
- Go to http site
-
-
-
diff --git a/browser/base/content/test/siteIdentity/file_bug902156_3.html b/browser/base/content/test/siteIdentity/file_bug902156_3.html
deleted file mode 100644
index 7a26f4b0f036..000000000000
--- a/browser/base/content/test/siteIdentity/file_bug902156_3.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
- Test 3 for Bug 902156
-
-
- Mixed Content Blocker enabled
-
-
-
diff --git a/browser/base/content/test/siteIdentity/file_bug906190.js b/browser/base/content/test/siteIdentity/file_bug906190.js
deleted file mode 100644
index 01ef4073fb88..000000000000
--- a/browser/base/content/test/siteIdentity/file_bug906190.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- * Once the mixed content blocker is disabled for the page, this scripts loads
- * and updates the text inside the div container.
- */
-document.getElementById("mctestdiv").innerHTML =
- "Mixed Content Blocker disabled";
diff --git a/browser/base/content/test/siteIdentity/file_bug906190.sjs b/browser/base/content/test/siteIdentity/file_bug906190.sjs
deleted file mode 100644
index 088153d671ed..000000000000
--- a/browser/base/content/test/siteIdentity/file_bug906190.sjs
+++ /dev/null
@@ -1,18 +0,0 @@
-function handleRequest(request, response) {
- var page = "bug 906190";
- var path =
- "https://test1.example.com/browser/browser/base/content/test/siteIdentity/";
- var url;
-
- if (request.queryString.includes("bad-redirection=1")) {
- url = path + "this_page_does_not_exist.html";
- } else {
- url = path + "file_bug906190_redirected.html";
- }
-
- response.setHeader("Cache-Control", "no-cache", false);
- response.setHeader("Content-Type", "text/html", false);
- response.setStatusLine(request.httpVersion, "302", "Found");
- response.setHeader("Location", url, false);
- response.write(page);
-}
diff --git a/browser/base/content/test/siteIdentity/file_bug906190_1.html b/browser/base/content/test/siteIdentity/file_bug906190_1.html
deleted file mode 100644
index 031c229f0d94..000000000000
--- a/browser/base/content/test/siteIdentity/file_bug906190_1.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
- Test 1 for Bug 906190
-
-
- Mixed Content Blocker enabled
-
-
-
diff --git a/browser/base/content/test/siteIdentity/file_bug906190_2.html b/browser/base/content/test/siteIdentity/file_bug906190_2.html
deleted file mode 100644
index 2a7546dca4f5..000000000000
--- a/browser/base/content/test/siteIdentity/file_bug906190_2.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
- Test 2 for Bug 906190
-
-
- Mixed Content Blocker enabled
-
-
-
diff --git a/browser/base/content/test/siteIdentity/file_bug906190_3_4.html b/browser/base/content/test/siteIdentity/file_bug906190_3_4.html
deleted file mode 100644
index e78e271f8579..000000000000
--- a/browser/base/content/test/siteIdentity/file_bug906190_3_4.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
- Test 3 and 4 for Bug 906190
-
-
-
-
diff --git a/browser/base/content/test/siteIdentity/file_bug906190_redirected.html b/browser/base/content/test/siteIdentity/file_bug906190_redirected.html
deleted file mode 100644
index d0bc4a39f5c8..000000000000
--- a/browser/base/content/test/siteIdentity/file_bug906190_redirected.html
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
- Redirected Page for Bug 906190
-
-
- Mixed Content Blocker enabled
-
-
-
diff --git a/browser/base/content/test/siteIdentity/file_bug1045809_1.html b/browser/base/content/test/siteIdentity/file_mixedActiveContent_1.html
similarity index 100%
rename from browser/base/content/test/siteIdentity/file_bug1045809_1.html
rename to browser/base/content/test/siteIdentity/file_mixedActiveContent_1.html
diff --git a/browser/base/content/test/siteIdentity/file_bug1045809_2.html b/browser/base/content/test/siteIdentity/file_mixedActiveContent_2.html
similarity index 100%
rename from browser/base/content/test/siteIdentity/file_bug1045809_2.html
rename to browser/base/content/test/siteIdentity/file_mixedActiveContent_2.html
diff --git a/browser/components/controlcenter/content/identityPanel.inc.xhtml b/browser/components/controlcenter/content/identityPanel.inc.xhtml
index 768768c7d448..225340c698f7 100644
--- a/browser/components/controlcenter/content/identityPanel.inc.xhtml
+++ b/browser/components/controlcenter/content/identityPanel.inc.xhtml
@@ -179,17 +179,6 @@
-
-
-
-
-
diff --git a/browser/locales/en-US/browser/browser.ftl b/browser/locales/en-US/browser/browser.ftl
index a4b034151ff0..75e624693372 100644
--- a/browser/locales/en-US/browser/browser.ftl
+++ b/browser/locales/en-US/browser/browser.ftl
@@ -454,12 +454,6 @@ identity-description-passive-loaded-insecure2 = This website contains content th
identity-description-passive-loaded-mixed2 = Although { -brand-short-name } has blocked some content, there is still content on the page that is not secure (such as images).
identity-description-active-loaded = This website contains content that is not secure (such as scripts) and your connection to it is not private.
identity-description-active-loaded-insecure = Information you share with this site could be viewed by others (like passwords, messages, credit cards, etc.).
-identity-disable-mixed-content-blocking =
- .label = Disable protection for now
- .accesskey = D
-identity-enable-mixed-content-blocking =
- .label = Enable protection
- .accesskey = E
identity-more-info-link-text =
.label = More information
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.sys.mjs b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.sys.mjs
index 288a1b2293af..5d978bb2573e 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.sys.mjs
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.sys.mjs
@@ -179,40 +179,6 @@ export var ControlCenter = {
},
},
- mixedActiveUnblocked: {
- selectors: CC_SELECTORS,
- async applyConfig() {
- let browserWindow =
- Services.wm.getMostRecentWindow("navigator:browser");
- let gBrowser = browserWindow.gBrowser;
- await loadPage(MIXED_ACTIVE_CONTENT_URL);
- gBrowser.ownerGlobal.gIdentityHandler.disableMixedContentProtection();
- await BrowserTestUtils.browserLoaded(
- gBrowser.selectedBrowser,
- false,
- MIXED_ACTIVE_CONTENT_URL
- );
- await openIdentityPopup();
- },
- },
-
- mixedActiveUnblockedSubView: {
- selectors: CC_SELECTORS,
- async applyConfig() {
- let browserWindow =
- Services.wm.getMostRecentWindow("navigator:browser");
- let gBrowser = browserWindow.gBrowser;
- await loadPage(MIXED_ACTIVE_CONTENT_URL);
- gBrowser.ownerGlobal.gIdentityHandler.disableMixedContentProtection();
- await BrowserTestUtils.browserLoaded(
- gBrowser.selectedBrowser,
- false,
- MIXED_ACTIVE_CONTENT_URL
- );
- await openIdentityPopup(true);
- },
- },
-
httpPassword: {
selectors: CC_SELECTORS,
async applyConfig() {
diff --git a/devtools/client/webconsole/test/browser/browser_webconsole_block_mixedcontent_securityerrors.js b/devtools/client/webconsole/test/browser/browser_webconsole_block_mixedcontent_securityerrors.js
index 2dcffdfcf38e..20d56cba9be0 100644
--- a/devtools/client/webconsole/test/browser/browser_webconsole_block_mixedcontent_securityerrors.js
+++ b/devtools/client/webconsole/test/browser/browser_webconsole_block_mixedcontent_securityerrors.js
@@ -6,9 +6,9 @@
// It then checks that the blocked mixed content warning messages
// are logged to the console and have the correct "Learn More"
// url appended to them. After the first test finishes, it invokes
-// a second test that overrides the mixed content blocker settings
-// by clicking on the doorhanger shield and validates that the
-// appropriate messages are logged to console.
+// a second test that disables the mixed content blocker by prefs
+// and validates that the appropriate messages are logged to
+// console.
// Bug 875456 - Log mixed content messages from the Mixed Content
// Blocker to the Security Pane in the Web Console.
@@ -35,7 +35,13 @@ const displayContentText =
"secure page";
add_task(async function () {
- await pushPrefEnv();
+ await SpecialPowers.pushPrefEnv({
+ set: [
+ ["security.mixed_content.block_active_content", true],
+ ["security.mixed_content.block_display_content", true],
+ ["security.mixed_content.upgrade_display_content", false],
+ ],
+ });
const hud = await openNewTabAndConsole(TEST_URI);
@@ -68,8 +74,15 @@ add_task(async function () {
gIdentityHandler._identityBox.classList.contains("mixedActiveBlocked"),
"Mixed Active Content state appeared on identity box"
);
+
// Disabe mixed content protection.
- gIdentityHandler.disableMixedContentProtection();
+ await SpecialPowers.pushPrefEnv({
+ set: [
+ ["security.mixed_content.block_active_content", false],
+ ["security.mixed_content.block_display_content", false],
+ ["security.mixed_content.upgrade_display_content", false],
+ ],
+ });
const waitForWarningMessage = text =>
waitFor(() => findWarningMessage(hud, text), undefined, 100);
@@ -77,6 +90,8 @@ add_task(async function () {
const onMixedActiveContent = waitForWarningMessage(activeContentText);
const onMixedDisplayContent = waitForWarningMessage(displayContentText);
+ gBrowser.reload();
+
await onMixedDisplayContent;
ok(true, "Mixed display content warning message is visible");
@@ -91,16 +106,4 @@ add_task(async function () {
LEARN_MORE_URI,
`Clicking the provided link opens ${response.link}`
);
-
- gIdentityHandler.enableMixedContentProtectionNoReload();
});
-
-function pushPrefEnv() {
- const prefs = [
- ["security.mixed_content.block_active_content", true],
- ["security.mixed_content.block_display_content", true],
- ["security.mixed_content.upgrade_display_content", false],
- ];
-
- return Promise.all(prefs.map(([pref, value]) => pushPref(pref, value)));
-}
diff --git a/docshell/base/WindowContext.cpp b/docshell/base/WindowContext.cpp
index 9bdc1c82f040..28ccdca3ab06 100644
--- a/docshell/base/WindowContext.cpp
+++ b/docshell/base/WindowContext.cpp
@@ -239,12 +239,6 @@ bool WindowContext::CanSet(FieldIndex, const bool& aIsSecure,
return CheckOnlyOwningProcessCanSet(aSource);
}
-bool WindowContext::CanSet(FieldIndex,
- const bool& aAllowMixedContent,
- ContentParent* aSource) {
- return CheckOnlyOwningProcessCanSet(aSource);
-}
-
bool WindowContext::CanSet(FieldIndex,
const bool& aHasBeforeUnload,
ContentParent* aSource) {
diff --git a/docshell/base/WindowContext.h b/docshell/base/WindowContext.h
index 573fc875153d..3ec937c0d5d1 100644
--- a/docshell/base/WindowContext.h
+++ b/docshell/base/WindowContext.h
@@ -62,9 +62,6 @@ class BrowsingContextGroup;
/* Mixed-Content: If the corresponding documentURI is https, \
* then this flag is true. */ \
FIELD(IsSecure, bool) \
- /* Whether the user has overriden the mixed content blocker to allow \
- * mixed content loads to happen */ \
- FIELD(AllowMixedContent, bool) \
/* Whether this window has registered a "beforeunload" event \
* handler */ \
FIELD(HasBeforeUnload, bool) \
@@ -274,8 +271,6 @@ class WindowContext : public nsISupports, public nsWrapperCache {
// Overload `CanSet` to get notifications for a particular field being set.
bool CanSet(FieldIndex, const bool& aIsSecure,
ContentParent* aSource);
- bool CanSet(FieldIndex, const bool& aAllowMixedContent,
- ContentParent* aSource);
bool CanSet(FieldIndex, const bool& aHasBeforeUnload,
ContentParent* aSource);
diff --git a/dom/ipc/WindowGlobalActor.cpp b/dom/ipc/WindowGlobalActor.cpp
index 20dd775bad95..9bba5fb17431 100644
--- a/dom/ipc/WindowGlobalActor.cpp
+++ b/dom/ipc/WindowGlobalActor.cpp
@@ -121,19 +121,6 @@ WindowGlobalInit WindowGlobalActor::WindowInitializer(
// Initialize top level permission fields
if (aWindow->GetBrowsingContext()->IsTop()) {
- fields.Get() = [&] {
- uint32_t permit = nsIPermissionManager::UNKNOWN_ACTION;
- nsCOMPtr permissionManager =
- components::PermissionManager::Service();
-
- if (permissionManager) {
- permissionManager->TestPermissionFromPrincipal(
- init.principal(), "mixed-content"_ns, &permit);
- }
-
- return permit == nsIPermissionManager::ALLOW_ACTION;
- }();
-
fields.Get() =
nsGlobalWindowInner::GetShortcutsPermission(init.principal());
}
diff --git a/dom/security/nsMixedContentBlocker.cpp b/dom/security/nsMixedContentBlocker.cpp
index ceb25063cf1e..adcc666be30a 100644
--- a/dom/security/nsMixedContentBlocker.cpp
+++ b/dom/security/nsMixedContentBlocker.cpp
@@ -824,7 +824,6 @@ nsresult nsMixedContentBlocker::ShouldLoad(bool aHadInsecureImageRedirect,
// Content
WindowContext* topWC = requestingWindow->TopWindowContext();
bool rootHasSecureConnection = topWC->GetIsSecure();
- bool allowMixedContent = topWC->GetAllowMixedContent();
// When navigating an iframe, the iframe may be https but its parents may not
// be. Check the parents to see if any of them are https. If none of the
@@ -897,8 +896,7 @@ nsresult nsMixedContentBlocker::ShouldLoad(bool aHadInsecureImageRedirect,
// If the content is display content, and the pref says display content should
// be blocked, block it.
if (classification == eMixedDisplay) {
- if (!StaticPrefs::security_mixed_content_block_display_content() ||
- allowMixedContent) {
+ if (!StaticPrefs::security_mixed_content_block_display_content()) {
*aDecision = nsIContentPolicy::ACCEPT;
// User has overriden the pref and the root is not https;
// mixed display content was allowed on an https subframe.
@@ -916,8 +914,7 @@ nsresult nsMixedContentBlocker::ShouldLoad(bool aHadInsecureImageRedirect,
MOZ_ASSERT(classification == eMixedScript);
// If the content is active content, and the pref says active content should
// be blocked, block it unless the user has choosen to override the pref
- if (!StaticPrefs::security_mixed_content_block_active_content() ||
- allowMixedContent) {
+ if (!StaticPrefs::security_mixed_content_block_active_content()) {
*aDecision = nsIContentPolicy::ACCEPT;
// User has already overriden the pref and the root is not https;
// mixed active content was allowed on an https subframe.