Backed out changeset 4f2475241df7 (bug 1550473) on request from ckerschb. a=backou

--HG--
extra : rebase_source : 8297426f6df40a9dc94fccf514ba3f4efa88889e

modules/libpref/init/all.js

@@ -2639,7 +2639,7 @@ pref("csp.overrule_about_uris_without_csp_whitelist", false);
 pref("csp.skip_about_page_has_csp_assert", false);
 // assertion flag will be set to false after fixing Bug 1473549
 pref("security.allow_eval_with_system_principal", false);
-pref("security.uris_using_eval_with_system_principal", "autocomplete.xml,redux.js,react-redux.js,content-task.js,preferencesbindings.js,lodash.js,jszip.js,sinon-7.2.7.js,jsol.js");
+pref("security.uris_using_eval_with_system_principal", "autocomplete.xml,redux.js,react-redux.js,content-task.js,preferencesbindings.js,lodash.js,jszip.js,sinon-7.2.7.js,ajv-4.1.1.js,jsol.js");
 #endif
 
 #ifdef EARLY_BETA_OR_EARLIER
@@ -6004,3 +6004,4 @@ pref("fission.preserve_browsing_contexts", false);
 //  * userContent.css
 //  * userChrome.css
 pref("toolkit.legacyUserProfileCustomizations.stylesheets", false);
+

services/sync/tests/unit/test_bookmark_engine.js

@@ -8,12 +8,6 @@ const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
 const {Bookmark, BookmarkFolder, BookmarksEngine, BufferedBookmarksEngine, Livemark} = ChromeUtils.import("resource://services-sync/engines/bookmarks.js");
 const {Service} = ChromeUtils.import("resource://services-sync/service.js");
 
-// Allow eval to avoid triggering the eval()-assertion through ajv-4.1.1.js
-Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true);
-registerCleanupFunction(() => {
-  Services.prefs.clearUserPref("security.allow_eval_with_system_principal");
-});
-
 var recordedEvents = [];
 
 function checkRecordedEvents(object, expected, message) {

services/sync/tests/unit/test_bookmark_order.js

@@ -6,12 +6,6 @@ const {Bookmark, BookmarkFolder, BookmarksEngine} = ChromeUtils.import("resource
 const {Weave} = ChromeUtils.import("resource://services-sync/main.js");
 const {Service} = ChromeUtils.import("resource://services-sync/service.js");
 
-// Allow eval to avoid triggering the eval()-assertion through ajv-4.1.1.js
-Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true);
-registerCleanupFunction(() => {
-  Services.prefs.clearUserPref("security.allow_eval_with_system_principal");
-});
-
 async function serverForFoo(engine) {
   await generateNewKeys(Service.collectionKeys);
 

services/sync/tests/unit/test_bookmark_validator.js

@@ -3,12 +3,6 @@
 
 const {BookmarkValidator} = ChromeUtils.import("resource://services-sync/bookmark_validator.js");
 
-// Allow eval to avoid triggering the eval()-assertion through ajv-4.1.1.js
-Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true);
-registerCleanupFunction(() => {
-  Services.prefs.clearUserPref("security.allow_eval_with_system_principal");
-});
-
 function run_test() {
   do_get_profile();
   run_next_test();

services/sync/tests/unit/test_collections_recovery.js

@@ -4,12 +4,6 @@
 // Verify that we wipe the server if we have to regenerate keys.
 const {Service} = ChromeUtils.import("resource://services-sync/service.js");
 
-// Allow eval to avoid triggering the eval()-assertion through ajv-4.1.1.js
-Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true);
-registerCleanupFunction(() => {
-  Services.prefs.clearUserPref("security.allow_eval_with_system_principal");
-});
-
 add_task(async function test_missing_crypto_collection() {
   enableValidationPrefs();
 

services/sync/tests/unit/test_corrupt_keys.js

@@ -6,12 +6,6 @@ const {HistoryEngine} = ChromeUtils.import("resource://services-sync/engines/his
 const {CryptoWrapper, WBORecord} = ChromeUtils.import("resource://services-sync/record.js");
 const {Service} = ChromeUtils.import("resource://services-sync/service.js");
 
-// Allow eval to avoid triggering the eval()-assertion through ajv-4.1.1.js
-Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true);
-registerCleanupFunction(() => {
-  Services.prefs.clearUserPref("security.allow_eval_with_system_principal");
-});
-
 add_task(async function test_locally_changed_keys() {
   enableValidationPrefs();
 

services/sync/tests/unit/test_engine_changes_during_sync.js

@@ -6,12 +6,6 @@ const {FormRec} = ChromeUtils.import("resource://services-sync/engines/forms.js"
 const {LoginRec} = ChromeUtils.import("resource://services-sync/engines/passwords.js");
 const {PrefRec} = ChromeUtils.import("resource://services-sync/engines/prefs.js");
 
-// Allow eval to avoid triggering the eval()-assertion through ajv-4.1.1.js
-Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true);
-registerCleanupFunction(() => {
-  Services.prefs.clearUserPref("security.allow_eval_with_system_principal");
-});
-
 const LoginInfo = Components.Constructor(
   "@mozilla.org/login-manager/loginInfo;1", Ci.nsILoginInfo, "init");
 

services/sync/tests/unit/test_errorhandler_1.js

@@ -4,12 +4,6 @@
 const {Service} = ChromeUtils.import("resource://services-sync/service.js");
 const {Status} = ChromeUtils.import("resource://services-sync/status.js");
 
-// Allow eval to avoid triggering the eval()-assertion through ajv-4.1.1.js
-Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true);
-registerCleanupFunction(() => {
-  Services.prefs.clearUserPref("security.allow_eval_with_system_principal");
-});
-
 const fakeServer = new SyncServer();
 fakeServer.start();
 const fakeServerUrl = "http://localhost:" + fakeServer.port;

services/sync/tests/unit/test_errorhandler_2.js

@@ -5,12 +5,6 @@ const {Service} = ChromeUtils.import("resource://services-sync/service.js");
 const {Status} = ChromeUtils.import("resource://services-sync/status.js");
 const {FileUtils} = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
 
-// Allow eval to avoid triggering the eval()-assertion through ajv-4.1.1.js
-Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true);
-registerCleanupFunction(() => {
-  Services.prefs.clearUserPref("security.allow_eval_with_system_principal");
-});
-
 const fakeServer = new SyncServer();
 fakeServer.start();
 const fakeServerUrl = "http://localhost:" + fakeServer.port;

services/sync/tests/unit/test_errorhandler_sync_checkServerError.js

@@ -5,12 +5,6 @@ const {Service} = ChromeUtils.import("resource://services-sync/service.js");
 const {Status} = ChromeUtils.import("resource://services-sync/status.js");
 const {FakeCryptoService} = ChromeUtils.import("resource://testing-common/services/sync/fakeservices.js");
 
-// Allow eval to avoid triggering the eval()-assertion through ajv-4.1.1.js
-Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true);
-registerCleanupFunction(() => {
-  Services.prefs.clearUserPref("security.allow_eval_with_system_principal");
-});
-
 var engineManager = Service.engineManager;
 
 function CatapultEngine() {

services/sync/tests/unit/test_history_engine.js

@@ -4,12 +4,6 @@
 const {Service} = ChromeUtils.import("resource://services-sync/service.js");
 const {HistoryEngine} = ChromeUtils.import("resource://services-sync/engines/history.js");
 
-// Allow eval to avoid triggering the eval()-assertion through ajv-4.1.1.js
-Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true);
-registerCleanupFunction(() => {
-  Services.prefs.clearUserPref("security.allow_eval_with_system_principal");
-});
-
 // Use only for rawAddVisit.
 XPCOMUtils.defineLazyServiceGetter(this, "asyncHistory",
                                    "@mozilla.org/browser/history;1",

services/sync/tests/unit/test_hmac_error.js

@@ -3,12 +3,6 @@
 
 const {Service} = ChromeUtils.import("resource://services-sync/service.js");
 
-// Allow eval to avoid triggering the eval()-assertion through ajv-4.1.1.js
-Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true);
-registerCleanupFunction(() => {
-  Services.prefs.clearUserPref("security.allow_eval_with_system_principal");
-});
-
 // Track HMAC error counts.
 var hmacErrorCount = 0;
 (function() {

services/sync/tests/unit/test_node_reassignment.js

@@ -8,11 +8,6 @@ const {RESTRequest} = ChromeUtils.import("resource://services-common/rest.js");
 const {Service} = ChromeUtils.import("resource://services-sync/service.js");
 const {PromiseUtils} = ChromeUtils.import("resource://gre/modules/PromiseUtils.jsm");
 
-// Allow eval to avoid triggering the eval()-assertion through ajv-4.1.1.js
-Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true);
-registerCleanupFunction(() => {
-  Services.prefs.clearUserPref("security.allow_eval_with_system_principal");
-});
 
 add_task(async function setup() {
   validate_all_future_pings();

services/sync/tests/unit/test_password_engine.js

@@ -2,12 +2,6 @@ const {FXA_PWDMGR_HOST, FXA_PWDMGR_REALM} = ChromeUtils.import("resource://gre/m
 const {LoginRec} = ChromeUtils.import("resource://services-sync/engines/passwords.js");
 const {Service} = ChromeUtils.import("resource://services-sync/service.js");
 
-// Allow eval to avoid triggering the eval()-assertion through ajv-4.1.1.js
-Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true);
-registerCleanupFunction(() => {
-  Services.prefs.clearUserPref("security.allow_eval_with_system_principal");
-});
-
 const LoginInfo = Components.Constructor(
   "@mozilla.org/login-manager/loginInfo;1", Ci.nsILoginInfo, "init");
 

services/sync/tests/unit/test_service_sync_remoteSetup.js

@@ -3,12 +3,6 @@
 
 const {Service} = ChromeUtils.import("resource://services-sync/service.js");
 
-// Allow eval to avoid triggering the eval()-assertion through ajv-4.1.1.js
-Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true);
-registerCleanupFunction(() => {
-  Services.prefs.clearUserPref("security.allow_eval_with_system_principal");
-});
-
 add_task(async function run_test() {
   enableValidationPrefs();
 

services/sync/tests/unit/test_service_sync_specified.js

@@ -3,12 +3,6 @@
 
 const {Service} = ChromeUtils.import("resource://services-sync/service.js");
 
-// Allow eval to avoid triggering the eval()-assertion through ajv-4.1.1.js
-Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true);
-registerCleanupFunction(() => {
-  Services.prefs.clearUserPref("security.allow_eval_with_system_principal");
-});
-
 let syncedEngines = [];
 
 function SteamEngine() {

services/sync/tests/unit/test_service_sync_updateEnabledEngines.js

@@ -3,12 +3,6 @@
 
 const {Service} = ChromeUtils.import("resource://services-sync/service.js");
 
-// Allow eval to avoid triggering the eval()-assertion through ajv-4.1.1.js
-Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true);
-registerCleanupFunction(() => {
-  Services.prefs.clearUserPref("security.allow_eval_with_system_principal");
-});
-
 function QuietStore() {
   Store.call("Quiet");
 }

services/sync/tests/unit/test_syncengine_sync.js

@@ -6,12 +6,6 @@ const {WBORecord} = ChromeUtils.import("resource://services-sync/record.js");
 const {Service} = ChromeUtils.import("resource://services-sync/service.js");
 const {RotaryEngine} = ChromeUtils.import("resource://testing-common/services/sync/rotaryengine.js");
 
-// Allow eval to avoid triggering the eval()-assertion through ajv-4.1.1.js
-Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true);
-registerCleanupFunction(() => {
-  Services.prefs.clearUserPref("security.allow_eval_with_system_principal");
-});
-
 function makeRotaryEngine() {
   return new RotaryEngine(Service);
 }

services/sync/tests/unit/test_syncscheduler.js

@@ -7,12 +7,6 @@ const {SyncScheduler} = ChromeUtils.import("resource://services-sync/policies.js
 const {Service} = ChromeUtils.import("resource://services-sync/service.js");
 const {Status} = ChromeUtils.import("resource://services-sync/status.js");
 
-// Allow eval to avoid triggering the eval()-assertion through ajv-4.1.1.js
-Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true);
-registerCleanupFunction(() => {
-  Services.prefs.clearUserPref("security.allow_eval_with_system_principal");
-});
-
 function CatapultEngine() {
   SyncEngine.call(this, "Catapult", Service);
 }

services/sync/tests/unit/test_telemetry.js

@@ -8,13 +8,6 @@ const {BookmarksEngine} = ChromeUtils.import("resource://services-sync/engines/b
 const {RotaryEngine} = ChromeUtils.import("resource://testing-common/services/sync/rotaryengine.js");
 const {OS} = ChromeUtils.import("resource://gre/modules/osfile.jsm");
 
-// Allow eval to avoid triggering the eval()-assertion through ajv-4.1.1.js
-Services.prefs.setBoolPref("security.allow_eval_with_system_principal", true);
-registerCleanupFunction(() => {
-  Services.prefs.clearUserPref("security.allow_eval_with_system_principal");
-});
-
-
 function SteamStore(engine) {
   Store.call(this, "Steam", engine);
 }