Backed out changeset 195bf8b32fcb (bug 1691526) for xpcshell failures on test_targeting.js. CLOSED TREE

Author: ncsoregi

toolkit/components/messaging-system/targeting/Targeting.jsm

@@ -15,8 +15,6 @@ XPCOMUtils.defineLazyModuleGetters(this, {
   FilterExpressions:
     "resource://gre/modules/components-utils/FilterExpressions.jsm",
   ClientEnvironment: "resource://normandy/lib/ClientEnvironment.jsm",
-  ClientEnvironmentBase:
-    "resource://gre/modules/components-utils/ClientEnvironment.jsm",
   AppConstants: "resource://gre/modules/AppConstants.jsm",
 });
 
@@ -58,10 +56,6 @@ const TargetingEnvironment = {
   get platform() {
     return AppConstants.platform;
   },
-
-  get os() {
-    return ClientEnvironmentBase.os;
-  },
 };
 
 class TargetingContext {

toolkit/components/messaging-system/targeting/test/unit/test_targeting.js

@@ -243,15 +243,3 @@ add_task(async function test_default_targeting() {
     );
   }
 });
-
-add_task(async function test_targeting_os() {
-  const targeting = new TargetingContext();
-  let res = await targeting.eval(
-    "ctx.os.isWindows || ctx.os.isMac || ctx.os.isLinux"
-  );
-  Assert.ok(res, `Should detect a platform got: ${res}`);
-  res = await targeting.eval(
-    "(ctx.os.windowsVersion && ctx.os.windowsBuildNumber) || ctx.os.macVersion || ctx.os.darwinVersion"
-  );
-  Assert.ok(res, `Should detect platform version got: ${res}`);
-});