The last backout introduced some mochitest orange. Let's see whether backing out bug 393267 as well fixes that.

js/src/xpconnect/src/XPCWrapper.cpp

@@ -295,19 +295,9 @@ XPCWrapper::NewResolve(JSContext *cx, JSObject *wrapperObj,
 
   JSBool isXOW = (JS_GET_CLASS(cx, wrapperObj) == &sXPC_XOW_JSClass.base);
   uintN attrs = JSPROP_ENUMERATE;
-  JSPropertyOp getter = nsnull;
-  JSPropertyOp setter = nsnull;
-  if (isXOW && OBJ_IS_NATIVE(innerObjp)) {
+  if (OBJ_IS_NATIVE(innerObjp)) {
     JSScopeProperty *sprop = reinterpret_cast<JSScopeProperty *>(prop);
-
     attrs = sprop->attrs;
-    if (attrs & JSPROP_GETTER) {
-      getter =  sprop->getter;
-    }
-    if (attrs & JSPROP_SETTER) {
-      setter = sprop->setter;
-    }
-
     if ((preserveVal || isXOW) &&
         SPROP_HAS_VALID_SLOT(sprop, OBJ_SCOPE(innerObjp))) {
       v = OBJ_GET_SLOT(cx, innerObjp, sprop->slot);
@@ -336,16 +326,8 @@ XPCWrapper::NewResolve(JSContext *cx, JSObject *wrapperObj,
     return JS_FALSE;
   }
 
-  const uintN interesting_attrs = isXOW
-                                  ? (JSPROP_ENUMERATE |
-                                     JSPROP_READONLY  |
-                                     JSPROP_PERMANENT |
-                                     JSPROP_SHARED    |
-                                     JSPROP_GETTER    |
-                                     JSPROP_SETTER)
-                                  : JSPROP_ENUMERATE;
-  JSBool ok = OBJ_DEFINE_PROPERTY(cx, wrapperObj, interned_id, v, getter,
-                                  setter, (attrs & interesting_attrs), nsnull);
+  JSBool ok = OBJ_DEFINE_PROPERTY(cx, wrapperObj, interned_id, v, nsnull,
+                                  nsnull, (attrs & JSPROP_ENUMERATE), nsnull);
 
   if (ok && (ok = ::JS_SetReservedSlot(cx, wrapperObj, sResolvingSlot,
                                        oldSlotVal))) {