Merge branch 'esr68' of github.com:mozilla/gecko-dev into gecko68

trman · Oct 2, 2019 · 3737e47 · 3737e47
2 parents 2c5c042 + 2eef046
commit 3737e47
Show file tree

Hide file tree

Showing 424 changed files with 9,412 additions and 4,211 deletions.
diff --git a/.hgtags b/.hgtags
@@ -1908,3 +1908,14 @@ b1482a07eafe84c33351cb4524404686a9fce427 FENNEC_68_1b7_RELEASE
 46d112299d475ffd9ef1c598f1ddb2ff3eec3360 FENNEC_68_1_RELEASE
 380fedbb18002297f1b233bd9c09764e59ddaa86 FIREFOX_68_1_0esr_RELEASE
 044e3567889ecbc7db40ae72632fb3bf974e409a FENNEC_68_2b1_RELEASE
+37ec6a002816ffa36f0b91ff0061bc4b5bc43004 FENNEC_68_2b2_BUILD1
+37ec6a002816ffa36f0b91ff0061bc4b5bc43004 FENNEC_68_2b2_RELEASE
+d2e0b9e17b9bc1ef02606c8006b73293f7892ad5 FENNEC_68_1_1_BUILD1
+d2e0b9e17b9bc1ef02606c8006b73293f7892ad5 FENNEC_68_1_1_RELEASE
+8f6f609ba95d4294b778292545c5e26335ca5247 FENNEC_68_2b3_BUILD1
+8f6f609ba95d4294b778292545c5e26335ca5247 FENNEC_68_2b3_RELEASE
+bf8b0830cda8e2d0364350449289711c4f74d398 FENNEC_68_2b4_BUILD1
+bf8b0830cda8e2d0364350449289711c4f74d398 FENNEC_68_2b4_BUILD2
+bf8b0830cda8e2d0364350449289711c4f74d398 FENNEC_68_2b4_RELEASE
+4ce4d8ccc5c09426914b3fda55027954760a8755 FENNEC_68_2b5_BUILD1
+4ce4d8ccc5c09426914b3fda55027954760a8755 FENNEC_68_2b5_RELEASE
diff --git a/accessible/html/HTMLFormControlAccessible.cpp b/accessible/html/HTMLFormControlAccessible.cpp
@@ -438,6 +438,23 @@ nsresult HTMLFileInputAccessible::HandleAccEvent(AccEvent* aEvent) {
   return NS_OK;
 }
 
+Accessible* HTMLFileInputAccessible::CurrentItem() const {
+  // Allow aria-activedescendant to override.
+  if (Accessible* item = HyperTextAccessibleWrap::CurrentItem()) {
+    return item;
+  }
+
+  // The HTML file input itself gets DOM focus, not the button inside it.
+  // For a11y, we want the button to get focus.
+  Accessible* button = FirstChild();
+  if (!button) {
+    MOZ_ASSERT_UNREACHABLE("File input doesn't contain a button");
+    return nullptr;
+  }
+  MOZ_ASSERT(button->IsButton());
+  return button;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // HTMLSpinnerAccessible
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/accessible/html/HTMLFormControlAccessible.h b/accessible/html/HTMLFormControlAccessible.h
@@ -122,6 +122,7 @@ class HTMLFileInputAccessible : public HyperTextAccessibleWrap {
   // Accessible
   virtual mozilla::a11y::role NativeRole() const override;
   virtual nsresult HandleAccEvent(AccEvent* aAccEvent) override;
+  virtual Accessible* CurrentItem() const override;
 };
 
 /**

diff --git a/accessible/tests/mochitest/events/test_focus_controls.html b/accessible/tests/mochitest/events/test_focus_controls.html
@@ -38,6 +38,9 @@
       gQueue.push(new changeCurrentItem("checkbox"));
       gQueue.push(new changeCurrentItem("radio1"));
 
+      let fileBrowseButton = getAccessible("file").firstChild;
+      gQueue.push(new synthFocus("file", new focusChecker(fileBrowseButton)));
+
       gQueue.invoke(); // Will call SimpleTest.finish();
     }
 
@@ -66,6 +69,7 @@
   <input id="checkbox" type="checkbox">
   <input id="radio1" type="radio" name="radiogroup">
   <input id="radio2" type="radio" name="radiogroup">
+  <input id="file" type="file">
 
   <div id="eventdump"></div>
 </body>

diff --git a/browser/app/blocklist.xml b/browser/app/blocklist.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1567022112963">
+<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1569844523596">
   <emItems>
     <emItem blockID="i334" id="{0F827075-B026-42F3-885D-98981EE7B1AE}">
       <prefs/>
@@ -3249,10 +3249,6 @@
       <prefs/>
       <versionRange minVersion="0" maxVersion="*" severity="3"/>
     </emItem>
-    <emItem blockID="bea9680c-28c0-48a1-b8d4-e418adeba748" id="/^((@searchincognito)|(@si-defaultsearch)|(@si-defaultsearch-listed)|(@searchassistincognito)|(@searchencrypt)|(@DiscreteSearch)|(@Discrete-Search)|(@searchsafe)|(@SearchSafeOrg)|(ffredirector@discretesearch\.com)|(ffredirector@encryptedsearch\.org)|(ffredirector@searchdefence\.com)|(ffredirector@searchencrypt\.com)|(ffredirector@searchencrypted\.com)|(ffredirector@searchincognito\.com)|(ffredirector@searchsafe\.co)|(ff_redirector@discretesearch\.com)|(ff_redirector@encryptedsearch\.org)|(ff_redirector@searchdefence\.com)|(ff_redirector@searchencrypt\.com)|(ff_redirector@searchencrypted\.com)|(ff_redirector@searchincognito\.com)|(ff_redirector@searchsafe\.co)|(@encryptedsearch)|(@searchdefence)|(@searchencrypted)|(@42e62954-834c-11e7-bb31-be2e44b06b34)|(@DiscreteSearchx)|(@4aec09f1-f1c9-456d-8c40-e0e86f302a0d)|(@566ff1c3-9432-4ed4-bd3d-b43cba47e051)|(@1df4e663-b9f3-4708-9f5d-44265b33397e)|(ff_redirector@searchsafe)|(\{9b62bdf8-a3c7-43d3-ba7f-0970cabffdaa\})|(\{95b48d11-b256-48ad-8ba1-bfe52f0a8bb8\})|(\{9e35a2be-64bd-49e3-aa47-fbeedf1834eb\})|(\{3ba10b5f-d9fa-4b40-8683-034d3dfc71d4\})|(\{20c31601-ebee-4677-a2f0-40e178bf7c77\})|(\{98e02622-f905-434e-9003-6c061b5c11c0\})|(@tabwow)|(gaidpiakchgkapdgbnoglpnbccdepnpk@chrome-store-foxified-258456913)|(@tabwow2)|(\{be8901e4-2a07-4554-aa05-a64351496e29\})|(moviestmpd@mozilla\.com)|(gaidpiakchgkapdgbnoglpnbccdepnpk@chrome-store-foxified-876542484)|(\{4a8ef415-e453-458f-bfbd-ae92569214db\})|(fireaction@mozilla\.com)|(\{bd9c448c-58b3-434f-9bb6-4ed2c155ba8e\})|(\{ebdfa19b-0906-4f78-9e95-7ef74d34c335\})|(websecure-unlisted@mozilla\.com)|(\{2d06d70b-8f32-4007-8f8b-1e0445bcebe7\})|(\{ddbe7345-acf4-4ebb-9baf-cd6d2df73b28\})|(\{b09d5b98-2d65-46fb-990c-69710577efa0\})|(\{3894384e-c719-4a0c-8d24-3816160fc56b\})|(search-encrypt-tab@mozilla\.xpi)|(\{1dafa1da-3894-48b9-ac8f-00bdc4f1868a\})|(\{99cfe634-328a-41a5-9a23-64094e4f4919\})|(inco-plugin@mozilla\.xpi)|(incognito-window@mozilla\.xpi)|(mac-search@mozilla\.xpi)|(fvdplayer@fvd\.com)|(playernewpp@ext\.com)|(\{492936c6-9121-4e54-8d4f-97f544e5bf98\})|(\{108a22ea-f316-4c2f-8427-fe65e02f9e2c\})|(cold@being\.net)|(\{38b99237-6c28-406f-898c-cc89df86051d\})|(search_redirect@mozilla\.xpi)|(\{d2ef4a8d-6ec0-4733-9f3f-2394178ecbf3\})|(tab_plugin@mozilla\.xpi)|(\{ae228e30-f40a-41a3-9e7e-53a094dcb8c6\})|(\{00ee7237-53cb-4036-8d4f-e78d78ca89e7\})|(\{d2f4002c-031b-4ad3-9fb1-afb003e8f932\})|(\{c0f366b3-7b3d-4486-a6f3-4ca1d7045091\})|(\{ccc6cfc4-3832-4d05-bf28-43a9722de93f\})|(\{dd02f638-ce6d-464e-8add-6ea0f314b1d1\})|(\{749ed3ff-4d23-4b32-812e-a35e3cf8c000\})|(tab_cleanup@mozilla\.xpi)|(incognito_tab@mozilla\.xpi)|(\{47c51f55-4f0b-499f-9fdd-c7c66bf4796a\})|(\{cd70c7c8-557d-46fa-9688-399c7c8d3d66\})|(\{681ad8e0-d1df-4cd2-a4cf-b97c1d6502a3\})|(\{0d58e690-bd48-4e3a-baf3-67aa40bc286a\})|(\{77bfbf26-4618-4120-9cb6-1fc7c92b8ddc\})|(\{037c6f6a-71f8-405b-9cff-fadf2ded6c47\})|(\{91cc3274-90d5-4e16-80e3-cd02fc513689\})|(\{2225b2af-0c3c-4345-adac-4f5bd40c2182\})|(\{81ca6b1e-a95b-4b44-9638-3ff3ea1a571d\})|(\{1e32acf8-fc1e-40ae-8783-c501ce50d597\})|(\{19670785-b1db-4d69-9538-2880ad8fdf20\})|(\{0113b4ad-15ca-4215-adeb-f0404f619ca6\})|(\{c7245149-4224-4c5c-91a4-84ea189f2227\})|(\{04dd2232-f1b1-4275-ae74-8bd27f3d850c\})|(prosearch@mozilla\.xpi)|(\{d549a064-98e7-49ed-ba9e-a724e79a004f\})|(\{fddd3bc6-9d4e-4ee7-b490-0d6141ff7d7f\})|(\{122795b5-ae28-4371-9b61-878f5db888ac\})|(\{e3d491de-802a-4f82-91eb-9403c9f43637\}))$/">
-      <prefs/>
-      <versionRange minVersion="0" maxVersion="*" severity="3"/>
-    </emItem>
     <emItem blockID="3460b6b7-8251-4588-8f12-81ac8d288c88" id="/^((\{b7a0ecf9-212b-49ca-bec1-ead0c6dc2128\})|(\{6e977a6d-b31d-4735-a586-41dc25df2100\})|(\{67155a2a-6538-42b1-bdc9-f48b442f57e7\})|(\{b4d4abc0-5e6e-4a34-a7e3-bfe7319160b8\})|(\{2102c5a9-f3c4-4f71-bb6e-c45c9d07b6c8\})|(\{071c1c7a-cde3-4a22-aefe-7c8f98df6277\})|(\{aa2f3e70-7dcf-4b4e-92c5-54c8280b98de\})|(\{3b376420-b276-4a0c-9e28-340dcc0547ce\})|(\{ed192371-abcc-4520-ab76-d22afbe51dff\})|(\{ad5a457f-59c8-4d90-8e3e-59f13a3bc2b2\})|(\{06aa60ab-91ad-4b8a-bfda-98e33b65fbb5\})|(\{c2875a12-da6a-4f90-a919-1d2bef57fbff\})|(\{b01d1c5b-58b5-4411-86d0-555131c7bd07\})|(\{0a79c7eb-5fe9-4e37-841e-18686bc86a20\})|(\{341ca205-d6e0-4d03-93be-04939c429412\})|(\{855e09d9-ac3a-4885-828d-557734060c1f\})|(\{8ac01eb1-9819-4c41-b2b7-042d8cdb3f2e\}))$/">
       <prefs/>
       <versionRange minVersion="0" maxVersion="*" severity="3"/>
@@ -3401,6 +3397,70 @@
       <prefs/>
       <versionRange minVersion="0" maxVersion="1.0.18" severity="3"/>
     </emItem>
+    <emItem blockID="67a61ba7-ad12-4eae-bdcc-e5b9b856dff4" id="{0fbe26d1-6891-475e-af3e-34f38a30348d}">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
+    <emItem blockID="6a54f1c3-93e1-4a38-885c-afb98e7bc4f2" id="/^((\{8d0073fa-3193-4a7f-8c95-6a4e3d9272ba\})|(445ac9f4aa1b833ce2dc75d6d6d6c76d0cef7cc7@temporary-addon)|(\{cd0672d3-72dc-43d2-ae77-6cda31fb7c88\})|(\{403321a6-be8d-4ae3-a66d-e5c846f993b8\}))$/">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
+    <emItem blockID="886e480a-8838-43c7-b9ca-b02592e23065" id="{1056b983-063b-4bd0-b7f7-1295f7e04ade}">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
+    <emItem blockID="13056233-543d-4c51-b89a-2a6b96ee324e" id="{23db2a76-49ca-4af2-af50-fccedd607e12}">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
+    <emItem blockID="e22dbf2b-70c8-41ed-b17a-32f53a22055b" id="{91c43d32-3a20-40cb-933b-47fd7c4b5a4e}">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
+    <emItem blockID="73cae2b8-f60e-47b3-afca-a1ff555f4ec5" id="/^((@yvd-addon)|(ydh@downloader\.youtube\.com)|(tomp3@youtube\.com))$/">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
+    <emItem blockID="1e56fd0a-77b6-477d-bada-78a5c18a37dd" id="/^((\{d81c0c7d-7420-4737-a3b9-dd9edeb4412f\})|(\{2bc89af7-d0ff-4b22-b7f6-ec87d15d999e\})|(\{3ee12352-a9db-4370-aa27-7e1d9acb628a\}))$/">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
+    <emItem blockID="ea29de20-dfe2-40c0-a5ec-45b1c780815d" id="/^((hd@youtube\.com)|(@youtube-to-mp4)|(youtube-downloader@youtube\.com))$/">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
+    <emItem blockID="b9d746da-8881-4854-8026-ecb708a588f6" id="{87bd05d5-d79e-4421-9c78-5c98ea78c351}">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
+    <emItem blockID="bea9680c-28c0-48a1-b8d4-e418adeba748" id="/^((@searchincognito)|(@si-defaultsearch)|(@si-defaultsearch-listed)|(@searchassistincognito)|(@DiscreteSearch)|(@Discrete-Search)|(@searchsafe)|(@SearchSafeOrg)|(ffredirector@discretesearch\.com)|(ffredirector@encryptedsearch\.org)|(ffredirector@searchdefence\.com)|(ffredirector@searchencrypt\.com)|(ffredirector@searchencrypted\.com)|(ffredirector@searchincognito\.com)|(ffredirector@searchsafe\.co)|(ff_redirector@discretesearch\.com)|(ff_redirector@encryptedsearch\.org)|(ff_redirector@searchdefence\.com)|(ff_redirector@searchencrypt\.com)|(ff_redirector@searchencrypted\.com)|(ff_redirector@searchincognito\.com)|(ff_redirector@searchsafe\.co)|(@encryptedsearch)|(@searchdefence)|(@searchencrypted)|(@42e62954-834c-11e7-bb31-be2e44b06b34)|(@DiscreteSearchx)|(@4aec09f1-f1c9-456d-8c40-e0e86f302a0d)|(@566ff1c3-9432-4ed4-bd3d-b43cba47e051)|(@1df4e663-b9f3-4708-9f5d-44265b33397e)|(ff_redirector@searchsafe)|(\{9b62bdf8-a3c7-43d3-ba7f-0970cabffdaa\})|(\{95b48d11-b256-48ad-8ba1-bfe52f0a8bb8\})|(\{9e35a2be-64bd-49e3-aa47-fbeedf1834eb\})|(\{3ba10b5f-d9fa-4b40-8683-034d3dfc71d4\})|(\{20c31601-ebee-4677-a2f0-40e178bf7c77\})|(\{98e02622-f905-434e-9003-6c061b5c11c0\})|(@tabwow)|(gaidpiakchgkapdgbnoglpnbccdepnpk@chrome-store-foxified-258456913)|(@tabwow2)|(\{be8901e4-2a07-4554-aa05-a64351496e29\})|(moviestmpd@mozilla\.com)|(gaidpiakchgkapdgbnoglpnbccdepnpk@chrome-store-foxified-876542484)|(\{4a8ef415-e453-458f-bfbd-ae92569214db\})|(fireaction@mozilla\.com)|(\{bd9c448c-58b3-434f-9bb6-4ed2c155ba8e\})|(\{ebdfa19b-0906-4f78-9e95-7ef74d34c335\})|(websecure-unlisted@mozilla\.com)|(\{2d06d70b-8f32-4007-8f8b-1e0445bcebe7\})|(\{ddbe7345-acf4-4ebb-9baf-cd6d2df73b28\})|(\{b09d5b98-2d65-46fb-990c-69710577efa0\})|(\{3894384e-c719-4a0c-8d24-3816160fc56b\})|(search-encrypt-tab@mozilla\.xpi)|(\{1dafa1da-3894-48b9-ac8f-00bdc4f1868a\})|(\{99cfe634-328a-41a5-9a23-64094e4f4919\})|(inco-plugin@mozilla\.xpi)|(incognito-window@mozilla\.xpi)|(mac-search@mozilla\.xpi)|(fvdplayer@fvd\.com)|(playernewpp@ext\.com)|(\{492936c6-9121-4e54-8d4f-97f544e5bf98\})|(\{108a22ea-f316-4c2f-8427-fe65e02f9e2c\})|(cold@being\.net)|(\{38b99237-6c28-406f-898c-cc89df86051d\})|(search_redirect@mozilla\.xpi)|(\{d2ef4a8d-6ec0-4733-9f3f-2394178ecbf3\})|(tab_plugin@mozilla\.xpi)|(\{ae228e30-f40a-41a3-9e7e-53a094dcb8c6\})|(\{00ee7237-53cb-4036-8d4f-e78d78ca89e7\})|(\{d2f4002c-031b-4ad3-9fb1-afb003e8f932\})|(\{c0f366b3-7b3d-4486-a6f3-4ca1d7045091\})|(\{ccc6cfc4-3832-4d05-bf28-43a9722de93f\})|(\{dd02f638-ce6d-464e-8add-6ea0f314b1d1\})|(\{749ed3ff-4d23-4b32-812e-a35e3cf8c000\})|(tab_cleanup@mozilla\.xpi)|(incognito_tab@mozilla\.xpi)|(\{47c51f55-4f0b-499f-9fdd-c7c66bf4796a\})|(\{cd70c7c8-557d-46fa-9688-399c7c8d3d66\})|(\{681ad8e0-d1df-4cd2-a4cf-b97c1d6502a3\})|(\{0d58e690-bd48-4e3a-baf3-67aa40bc286a\})|(\{77bfbf26-4618-4120-9cb6-1fc7c92b8ddc\})|(\{037c6f6a-71f8-405b-9cff-fadf2ded6c47\})|(\{91cc3274-90d5-4e16-80e3-cd02fc513689\})|(\{2225b2af-0c3c-4345-adac-4f5bd40c2182\})|(\{81ca6b1e-a95b-4b44-9638-3ff3ea1a571d\})|(\{1e32acf8-fc1e-40ae-8783-c501ce50d597\})|(\{19670785-b1db-4d69-9538-2880ad8fdf20\})|(\{0113b4ad-15ca-4215-adeb-f0404f619ca6\})|(\{c7245149-4224-4c5c-91a4-84ea189f2227\})|(\{04dd2232-f1b1-4275-ae74-8bd27f3d850c\})|(prosearch@mozilla\.xpi)|(\{d549a064-98e7-49ed-ba9e-a724e79a004f\})|(\{fddd3bc6-9d4e-4ee7-b490-0d6141ff7d7f\})|(\{122795b5-ae28-4371-9b61-878f5db888ac\})|(\{e3d491de-802a-4f82-91eb-9403c9f43637\}))$/">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
+    <emItem blockID="3c782d96-5d25-45d3-8f07-016a791e316c" id="@searchencrypt">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="3.5.0" severity="3"/>
+    </emItem>
+    <emItem blockID="72464ab8-9b51-420f-8e54-bc0f8bb01cf1" id="/^((ehfiibbkgllccnbifchmillffgdlmidi@chrome-store-foxified-3843796584)|(ehfiibbkgllccnbifchmillffgdlmidi@chrome-store-foxified-3264908934))$/">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
+    <emItem blockID="dd1261a3-6944-4f51-8118-b0a8f2055d69" id="{381f21b1-95bf-4042-bc5c-3a40b2a03f10}">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
+    <emItem blockID="70655a4b-064d-44ab-8d0e-3bec419343ee" id="[email protected]">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
+    <emItem blockID="4c3153a8-7551-48f3-a4fa-8ad6cb28faa8" id="{f39b7905-00d5-4391-9a4b-751ca08dd6b2}">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
+    <emItem blockID="f3133639-f5e5-4b47-a80f-2993fa97ca4a" id="{546bc2af-d6e7-499f-90b6-58305b836702}">
+      <prefs/>
+      <versionRange minVersion="0" maxVersion="*" severity="3"/>
+    </emItem>
   </emItems>
   <pluginItems>
     <pluginItem blockID="p332">

diff --git a/browser/app/nsBrowserApp.cpp b/browser/app/nsBrowserApp.cpp
@@ -4,6 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsXULAppAPI.h"
+#include "mozilla/CmdLineAndEnvUtils.h"
 #include "mozilla/XREAppData.h"
 #include "application.ini.h"
 #include "mozilla/Bootstrap.h"
@@ -209,6 +210,10 @@ static int do_main(int argc, char* argv[], char* envp[]) {
     gBootstrap->XRE_LibFuzzerSetDriver(fuzzer::FuzzerDriver);
 #endif
 
+  // Note: keep in sync with LauncherProcessWin.
+  const char* acceptableParams[] = {"url", nullptr};
+  EnsureCommandlineSafe(argc, argv, acceptableParams);
+
   return gBootstrap->XRE_main(argc, argv, config);
 }
 

diff --git a/browser/app/winlauncher/LauncherProcessWin.cpp b/browser/app/winlauncher/LauncherProcessWin.cpp
@@ -200,7 +200,9 @@ namespace mozilla {
 
 Maybe<int> LauncherMain(int& argc, wchar_t* argv[],
                         const StaticXREAppData& aAppData) {
-  EnsureCommandlineSafe(argc, argv);
+  // Note: keep in sync with nsBrowserApp.
+  const wchar_t* acceptableParams[] = {L"url", nullptr};
+  EnsureCommandlineSafe(argc, argv, acceptableParams);
 
   SetLauncherErrorAppData(aAppData);
 

diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
@@ -1250,7 +1250,12 @@ XPCOMUtils.defineLazyPreferenceGetter(
 );
 
 function gKeywordURIFixup({ target: browser, data: fixupInfo }) {
-  let deserializeURI = spec => (spec ? makeURI(spec) : null);
+  let deserializeURI = url => {
+    if (url instanceof Ci.nsIURI) {
+      return url;
+    }
+    return url ? makeURI(url) : null;
+  };
 
   // We get called irrespective of whether we did a keyword search, or
   // whether the original input would be vaguely interpretable as a URL,

diff --git a/browser/base/content/test/static/browser_all_files_referenced.js b/browser/base/content/test/static/browser_all_files_referenced.js
@@ -105,9 +105,6 @@ var whitelist = [
   { file: "resource://gre/res/fonts/mathfontSTIXGeneral.properties" },
   { file: "resource://gre/res/fonts/mathfontUnicode.properties" },
 
-  // Needed by HiddenFrame.jsm, but can't be packaged test-only
-  { file: "chrome://global/content/win.xul" },
-
   // The l10n build system can't package string files only for some platforms.
   {
     file:

diff --git a/browser/base/content/test/static/browser_parsable_css.js b/browser/base/content/test/static/browser_parsable_css.js
@@ -408,7 +408,7 @@ add_task(async function checkAllTheCSS() {
   // chrome URI so that it's allowed to load and parse any styles.
   let testFile = getRootDirectory(gTestPath) + "dummy_page.html";
   let HiddenFrame = ChromeUtils.import(
-    "resource://testing-common/HiddenFrame.jsm",
+    "resource://gre/modules/HiddenFrame.jsm",
     {}
   ).HiddenFrame;
   let hiddenFrame = new HiddenFrame();

diff --git a/browser/components/customizableui/test/browser_PanelMultiView_keyboard.js b/browser/components/customizableui/test/browser_PanelMultiView_keyboard.js
@@ -65,6 +65,11 @@ async function expectFocusAfterKey(aKey, aFocus) {
 }
 
 add_task(async function setup() {
+  // This shouldn't be necessary - but it is, because we use same-process frames.
+  // https://bugzilla.mozilla.org/show_bug.cgi?id=1565276 covers improving this.
+  await SpecialPowers.pushPrefEnv({
+    set: [["security.allow_unsafe_parent_loads", true]],
+  });
   let navBar = document.getElementById("nav-bar");
   gAnchor = document.createXULElement("toolbarbutton");
   navBar.appendChild(gAnchor);

diff --git a/browser/components/enterprisepolicies/Policies.jsm b/browser/components/enterprisepolicies/Policies.jsm
@@ -610,6 +610,20 @@ var Policies = {
         setAndLockPref("privacy.trackingprotection.enabled", false);
         setAndLockPref("privacy.trackingprotection.pbmode.enabled", false);
       }
+      if ("Cryptomining" in param) {
+        setDefaultPref(
+          "privacy.trackingprotection.cryptomining.enabled",
+          param.Cryptomining,
+          param.Locked
+        );
+      }
+      if ("Fingerprinting" in param) {
+        setDefaultPref(
+          "privacy.trackingprotection.fingerprinting.enabled",
+          param.Fingerprinting,
+          param.Locked
+        );
+      }
     },
   },
 
@@ -966,6 +980,12 @@ var Policies = {
     },
   },
 
+  OfferToSaveLoginsDefault: {
+    onBeforeUIStartup(manager, param) {
+      setDefaultPref("signon.rememberSignons", param);
+    },
+  },
+
   OverrideFirstRunPage: {
     onProfileAfterChange(manager, param) {
       let url = param ? param.href : "";
@@ -984,6 +1004,18 @@ var Policies = {
     },
   },
 
+  PasswordManagerEnabled: {
+    onBeforeUIStartup(manager, param) {
+      if (!param) {
+        // Passing no pages simply initializes the blocker
+        blockAboutPage(manager);
+        gBlockedChromePages.push("passwordManager.xul");
+        setAndLockPref("pref.privacy.disable_button.view_passwords", true);
+      }
+      setAndLockPref("signon.rememberSignons", param);
+    },
+  },
+
   Permissions: {
     onBeforeUIStartup(manager, param) {
       if (param.Camera) {
@@ -1614,6 +1646,9 @@ function blockAboutPage(manager, feature, neededOnContentProcess = false) {
   if (!gBlockedChromePages.length) {
     addChromeURLBlocker();
   }
+  if (!feature) {
+    return;
+  }
   manager.disallowFeature(feature, neededOnContentProcess);
   let splitURL = Services.io
     .newChannelFromURI(

diff --git a/browser/components/enterprisepolicies/schemas/policies-schema.json b/browser/components/enterprisepolicies/schemas/policies-schema.json
@@ -292,9 +292,14 @@
         },
         "Locked": {
           "type": "boolean"
+        },
+        "Cryptomining": {
+          "type": "boolean"
+        },
+        "Fingerprinting": {
+          "type": "boolean"
         }
-      },
-      "required": ["Value"]
+      }
     },
 
     "Extensions": {
@@ -492,6 +497,10 @@
       "type": "boolean"
     },
 
+    "OfferToSaveLoginsDefault": {
+      "type": "boolean"
+    },
+
     "OverrideFirstRunPage": {
       "type": "URLorEmpty"
     },
@@ -500,6 +509,10 @@
       "type": "URLorEmpty"
     },
 
+    "PasswordManagerEnabled": {
+      "type": "boolean"
+    },
+
     "Permissions": {
       "type": "object",
       "properties": {

diff --git a/browser/components/enterprisepolicies/tests/browser/browser.ini b/browser/components/enterprisepolicies/tests/browser/browser.ini
@@ -41,6 +41,7 @@ skip-if = (verify && debug && (os == 'mac'))
 [browser_policy_extensionsettings.js]
 [browser_policy_firefoxhome.js]
 [browser_policy_override_postupdatepage.js]
+[browser_policy_passwordmanager.js]
 [browser_policy_search_engine.js]
 [browser_policy_searchbar.js]
 [browser_policy_set_homepage.js]