Bug 1477202 - Avoid shipping PerTestCoverageUtils.jsm to users by only adding it to Marionette when MOZ_CODE_COVERAGE is defined. r=florian

browser/base/content/test/static/browser_all_files_referenced.js

@@ -132,7 +132,6 @@ var whitelist = [
   {file: "chrome://marionette/content/test_anonymous_content.xul"},
   {file: "chrome://marionette/content/test_dialog.properties"},
   {file: "chrome://marionette/content/test_dialog.xul"},
-  {file: "chrome://marionette/content/PerTestCoverageUtils.jsm"},
   // Bug 1348533
   {file: "chrome://mozapps/skin/downloads/buttons.png", platforms: ["macosx"]},
   {file: "chrome://mozapps/skin/downloads/downloadButtons.png", platforms: ["linux", "win"]},
@@ -203,6 +202,10 @@ if (!isDevtools) {
 
 }
 
+if (AppConstants.MOZ_CODE_COVERAGE) {
+  whitelist.add("chrome://marionette/content/PerTestCoverageUtils.jsm");
+}
+
 const gInterestingCategories = new Set([
   "agent-style-sheets", "addon-provider-module", "webextension-modules",
   "webextension-scripts", "webextension-schemas", "webextension-scripts-addon",

testing/marionette/jar.mn

@@ -46,5 +46,7 @@ marionette.jar:
   content/test_dialog.xul (chrome/test_dialog.xul)
   content/test_nested_iframe.xul (chrome/test_nested_iframe.xul)
   content/test.xul (chrome/test.xul)
+#ifdef MOZ_CODE_COVERAGE
   content/PerTestCoverageUtils.jsm (../../tools/code-coverage/PerTestCoverageUtils.jsm)
 #endif
+#endif

toolkit/modules/AppConstants.jsm

@@ -319,4 +319,11 @@ this.AppConstants = Object.freeze({
 #else
     false,
 #endif
+
+  MOZ_CODE_COVERAGE:
+#ifdef MOZ_CODE_COVERAGE
+    true,
+#else
+    false,
+#endif
 });