Bug 1445386 - Use GreD for artifact build scalars. r=chutten

On macOS, the paths for the special directories `GreD` (Resources) vs. `GreBinD`
(MacOS) are different.  On other platforms, they are the same.

With scalar loading for artifact builds, we need to load a file from
`Resources`, so `GreD` should be used for this case.

MozReview-Commit-ID: 91JFwOISQCk

--HG--
extra : rebase_source : ad77362039a0b8174acd14f9512fdf6cef747590

toolkit/components/telemetry/TelemetryController.jsm

@@ -1071,7 +1071,7 @@ var Impl = {
 
     // Load the scalar probes JSON file.
     const scalarProbeFilename = "ScalarArtifactDefinitions.json";
-    let scalarProbeFile = Services.dirsvc.get("GreBinD", Ci.nsIFile);
+    let scalarProbeFile = Services.dirsvc.get("GreD", Ci.nsIFile);
     scalarProbeFile.append(scalarProbeFilename);
     if (!scalarProbeFile.exists()) {
       this._log.trace("registerJsProbes - no scalar builtin JS probes");

toolkit/components/telemetry/tests/unit/test_TelemetryScalars_buildFaster.js

@@ -15,7 +15,7 @@ ChromeUtils.import("resource://services-common/utils.js");
 function getDefinitionsPath() {
   // Write the scalar definition to the spec file in the binary directory.
   let definitionFile = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
-  definitionFile = Services.dirsvc.get("GreBinD", Ci.nsIFile);
+  definitionFile = Services.dirsvc.get("GreD", Ci.nsIFile);
   definitionFile.append("ScalarArtifactDefinitions.json");
   return definitionFile.path;
 }