Bug 1541508 - Use Services.env in extensions/ r=extension-reviewers,robwu

Differential Revision: https://phabricator.services.mozilla.com/D160139

extensions/pref/autoconfig/src/prefcalls.js

@@ -195,10 +195,7 @@ function displayError(funcname, message) {
 
 function getenv(name) {
   try {
-    var environment = Cc["@mozilla.org/process/environment;1"].getService(
-      Ci.nsIEnvironment
-    );
-    return environment.get(name);
+    return Services.env.get(name);
   } catch (e) {
     displayError("getEnvironment", e);
   }

extensions/pref/autoconfig/test/unit/test_autoconfig.js

@@ -6,9 +6,6 @@
  * http://eslint.org/docs/rules/no-unsafe-finally  */
 
 function run_test() {
-  let env = Cc["@mozilla.org/process/environment;1"].getService(
-    Ci.nsIEnvironment
-  );
   let prefs = Services.prefs.getBranch(null);
   let defPrefs = Services.prefs.getDefaultBranch(null);
 
@@ -29,7 +26,7 @@ function run_test() {
     autoConfigCfg.append("autoconfig-all.cfg");
     autoConfigCfg.copyTo(greD, "autoconfig.cfg");
 
-    env.set("AUTOCONFIG_TEST_GETENV", "getenv");
+    Services.env.set("AUTOCONFIG_TEST_GETENV", "getenv");
 
     Services.obs.notifyObservers(
       Services.prefs,

extensions/pref/autoconfig/test/unit/test_autoconfig_custom_path.js

@@ -6,12 +6,8 @@ const { updateAppInfo } = ChromeUtils.importESModule(
 );
 
 function run_test() {
-  let env = Cc["@mozilla.org/process/environment;1"].getService(
-    Ci.nsIEnvironment
-  );
-
   let testDirName = do_get_cwd().clone();
-  env.set("MOZ_SYSTEM_CONFIG_DIR", testDirName.path);
+  Services.env.set("MOZ_SYSTEM_CONFIG_DIR", testDirName.path);
 
   updateAppInfo();
 

extensions/pref/autoconfig/test/unit/test_autoconfig_snap.js

@@ -20,16 +20,13 @@ function ensureRemove(file) {
 }
 
 async function run_test() {
-  let env = Cc["@mozilla.org/process/environment;1"].getService(
-    Ci.nsIEnvironment
-  );
   let prefs = Services.prefs.getBranch(null);
 
   let testDir = do_get_cwd();
   let confDir = testDir.clone();
   confDir.append("MozSystemConfigDir");
-  env.set("MOZ_SYSTEM_CONFIG_DIR", confDir.path);
-  env.set("SNAP_INSTANCE_NAME", "xpcshell");
+  Services.env.set("MOZ_SYSTEM_CONFIG_DIR", confDir.path);
+  Services.env.set("SNAP_INSTANCE_NAME", "xpcshell");
 
   updateAppInfo();