Bug 1351675 - Add certificates pinning initial JSON to package r=florian
authorMathieu Leplatre <mathieu@mozilla.com>
Mon, 10 Apr 2017 16:50:41 +0200
changeset 353931 4266cb39733da9b8316c613c7f03a91e693c893b
parent 353930 ea35685faf0d574f2588ba98e027be10876c7e41
child 353932 6d1a1617e80566d3fa812c3b9445afdf6b3744c2
push id31681
push userkwierso@gmail.com
push dateThu, 20 Apr 2017 00:11:50 +0000
treeherdermozilla-central@20dff607fb88 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflorian
bugs1351675
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1351675 - Add certificates pinning initial JSON to package r=florian MozReview-Commit-ID: EYT0s7xUyKN
browser/base/content/test/static/browser_all_files_referenced.js
browser/installer/package-manifest.in
--- a/browser/base/content/test/static/browser_all_files_referenced.js
+++ b/browser/base/content/test/static/browser_all_files_referenced.js
@@ -5,16 +5,17 @@
 requestLongerTimeout(5);
 
 var isDevtools = SimpleTest.harnessParameters.subsuite == "devtools";
 
 var gExceptionPaths = [
   "chrome://browser/content/defaultthemes/",
   "chrome://browser/locale/searchplugins/",
   "resource://app/defaults/blocklists/",
+  "resource://app/defaults/pinning/",
   "resource://app/defaults/preferences/",
   "resource://gre/modules/commonjs/",
   "resource://gre/defaults/pref/",
   "resource://shield-recipe-client/node_modules/jexl/lib/",
 
   // https://github.com/mozilla/normandy/issues/577
   "resource://shield-recipe-client/test/",
 
@@ -280,19 +281,16 @@ const ignorableWhitelist = new Set([
   // when testing on a non-packaged build.
 
   // toolkit/mozapps/extensions/nsBlocklistService.js
   "resource://app/blocklist.xml",
 
   // dom/media/gmp/GMPParent.cpp
   "resource://gre/gmp-clearkey/0.1/manifest.json",
 
-  // Bug 1351675 - should this file be packaged?
-  "resource://app/defaults/pinning/pins.json",
-
   // Bug 1351682 - should be removed?
   "resource://app/defaults/profile/prefs.js",
 
   // Bug 1351669 - obsolete test file
   "resource://gre/res/test.properties",
 ]);
 for (let entry of ignorableWhitelist) {
   whitelist.add(entry);
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -644,16 +644,17 @@
 ; [Default Preferences]
 ; All the pref files must be part of base to prevent migration bugs
 @RESPATH@/browser/@PREF_DIR@/firefox.js
 @RESPATH@/browser/@PREF_DIR@/firefox-branding.js
 @RESPATH@/greprefs.js
 @RESPATH@/defaults/autoconfig/prefcalls.js
 @RESPATH@/browser/defaults/permissions
 @RESPATH@/browser/defaults/blocklists
+@RESPATH@/browser/defaults/pinning
 
 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
 ; Technically this is an app pref file, but we are keeping it in the original
 ; gre location for now.
 @RESPATH@/defaults/pref/channel-prefs.js
 
 ; Remote control protocol prefs
 ; defined in ../../testing/marionette/prefs/marionette.js