Backed out changeset b44401afec64 (bug 1251855) because the fix is no longer needed since bug 1232639 landed on Gecko 47+. a=test-only
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 31 Mar 2016 23:06:26 -0400
changeset 323735 b5878f102851ebe591f540eb97e567a9aed8f7d9
parent 323734 11a460c667e4ffc7c3b7fdda8282fcb502ca7a52
child 323736 c9d25791f8219540e527c3d18aa919418fff4061
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstest-only
bugs1251855, 1232639
milestone47.0a2
backs outb44401afec64502cff919833340419338442bdc9
Backed out changeset b44401afec64 (bug 1251855) because the fix is no longer needed since bug 1232639 landed on Gecko 47+. a=test-only
js/xpconnect/tests/chrome/test_xrayToJS.xul
--- a/js/xpconnect/tests/chrome/test_xrayToJS.xul
+++ b/js/xpconnect/tests/chrome/test_xrayToJS.xul
@@ -20,19 +20,16 @@ https://bugzilla.mozilla.org/show_bug.cg
 
   /** Test for ES constructors on Xrayed globals. **/
   SimpleTest.waitForExplicitFinish();
   const Cc = Components.classes;
   const Ci = Components.interfaces;
   const Cu = Components.utils;
   let global = Cu.getGlobalForObject.bind(Cu);
 
-  /** Needed for AppConstants.RELEASE_BUILD usage further down **/
-  Cu.import("resource://gre/modules/AppConstants.jsm")
-
   function checkThrows(f, rgxp, msg) {
     try {
       f();
       ok(false, "Should have thrown: " + msg);
     } catch (e) {
       ok(true, "Threw as expected: " + msg);
       ok(rgxp.test(e), "Message correct: " + e);
     }
@@ -168,29 +165,23 @@ https://bugzilla.mozilla.org/show_bug.cg
     "toISOString", "toJSON", "toSource", "toString", "valueOf", "constructor",
     "toGMTString", Symbol.toPrimitive];
   gConstructorProperties['Date'] = constructorProps(["UTC", "parse", "now"]);
   gPrototypeProperties['Object'] =
     ["constructor", "toSource", "toString", "toLocaleString", "valueOf", "watch",
      "unwatch", "hasOwnProperty", "isPrototypeOf", "propertyIsEnumerable",
      "__defineGetter__", "__defineSetter__", "__lookupGetter__", "__lookupSetter__",
      "__proto__"];
-
-  /** Bug 1251855 - "entries" and "values" are not exposed to release builds **/
   gConstructorProperties['Object'] =
     constructorProps(["setPrototypeOf", "getOwnPropertyDescriptor", "keys",
                       "is", "defineProperty", "defineProperties", "create",
                       "getOwnPropertyNames", "getOwnPropertySymbols",
                       "preventExtensions", "freeze", "isFrozen", "seal",
-                      "isSealed", "assign", "getPrototypeOf", "isExtensible"])
-  if (!AppConstants.RELEASE_BUILD) {
-    gConstructorProperties['Object'] = 
-      gConstructorProperties['Object'].concat(["values", "entries"]);
-  }
-
+                      "isSealed", "assign", "getPrototypeOf", "values",
+                      "entries", "isExtensible"])
   gPrototypeProperties['Array'] =
     ["length", "toSource", "toString", "toLocaleString", "join", "reverse", "sort", "push",
       "pop", "shift", "unshift", "splice", "concat", "slice", "lastIndexOf", "indexOf",
       "includes", "forEach", "map", "reduce", "reduceRight", "filter", "some", "every", "find",
       "findIndex", "copyWithin", "fill", Symbol.iterator, "entries", "keys", "constructor"];
   gConstructorProperties['Array'] =
     constructorProps(["join", "reverse", "sort", "push", "pop", "shift",
                       "unshift", "splice", "concat", "slice", "isArray",