Bug 1337748 - Move security-prefs.js from netwerk/ to security/manager/. r=keeler,mcmanus draft
authorMasatoshi Kimura <VYV03354@nifty.ne.jp>
Wed, 08 Feb 2017 21:16:27 +0900
changeset 481677 e11ef6fa7264edd41e77d65512a2183c737f34dd
parent 481595 25a94c1047e793ef096d8556fa3c26dd72bd37d7
child 545280 847771ca391cb7f8c51de9ce51628276f6c5a1a3
push id44911
push userVYV03354@nifty.ne.jp
push dateFri, 10 Feb 2017 11:40:26 +0000
reviewerskeeler, mcmanus
bugs1337748
milestone54.0a1
Bug 1337748 - Move security-prefs.js from netwerk/ to security/manager/. r=keeler,mcmanus MozReview-Commit-ID: 2TOJG6tRWJZ
.eslintignore
modules/libpref/greprefs.js
netwerk/base/security-prefs.js
security/manager/ssl/security-prefs.js
--- a/.eslintignore
+++ b/.eslintignore
@@ -181,16 +181,22 @@ mobile/android/locales/
 
 # Non-standard `(catch ex if ...)`
 mobile/android/chrome/content/browser.js
 mobile/android/components/Snippets.js
 
 # Bug 1178739: Ignore this file as a quick fix for "Illegal yield expression"
 mobile/android/modules/HomeProvider.jsm
 
+# security/ exclusions (pref files).
+security/manager/ssl/security-prefs.js
+
+#NSS
+security/nss/**
+
 # services/ exclusions
 
 # Uses `#filter substitution`
 services/sync/modules/constants.js
 
 # Third party services
 services/common/kinto-http-client.js
 services/common/kinto-offline-client.js
@@ -223,11 +229,8 @@ toolkit/components/urlformatter/nsURLFor
 toolkit/modules/AppConstants.jsm
 toolkit/mozapps/downloads/nsHelperAppDlg.js
 toolkit/mozapps/extensions/internal/AddonConstants.jsm
 toolkit/mozapps/update/tests/data/xpcshellConstantsPP.js
 toolkit/webapps/**
 
 # Third party
 toolkit/modules/third_party/**
-
-#NSS
-security/nss/**
--- a/modules/libpref/greprefs.js
+++ b/modules/libpref/greprefs.js
@@ -1,9 +1,9 @@
-#include ../../netwerk/base/security-prefs.js
+#include ../../security/manager/ssl/security-prefs.js
 #include init/all.js
 #ifdef MOZ_DATA_REPORTING
 #include ../../toolkit/components/telemetry/datareporting-prefs.js
 #endif
 #ifdef MOZ_SERVICES_HEALTHREPORT
 #if MOZ_WIDGET_TOOLKIT == android
 #include ../../mobile/android/chrome/content/healthreport-prefs.js
 #else
rename from netwerk/base/security-prefs.js
rename to security/manager/ssl/security-prefs.js