Backed out changeset 6d172e86ce2e (bug 1022002) for tipping Android 2.3 reftest-6 runtimes over the max time limit

js/xpconnect/src/XPCComponents.cpp

@@ -3531,7 +3531,7 @@ CloneIntoReadStructuredClone(JSContext *cx,
       if (!JS_WrapObject(cx, &obj))
           return nullptr;
 
-      if (!xpc::NewFunctionForwarder(cx, obj, true, &functionValue))
+      if (!xpc::NewFunctionForwarder(cx, obj, false, &functionValue))
           return nullptr;
 
       return &functionValue.toObject();

js/xpconnect/tests/chrome/test_cloneInto.xul

@@ -161,14 +161,8 @@
        'CloneInto should only work on less privileged target scopes.');
   }
 
-  var test = { a: function() { return 42; } };
+  var test = { a: function() { return 42; } }
   cloneAndTestWithFunctions(test);
-
-  // Check that we're cloning input to functions:
-  test = { a: function(obj) { return obj; } };
-  var clonedTest = Cu.cloneInto(test, sandbox, {cloneFunctions: true});
-  var testInput = {};
-  isnot(clonedTest.a(testInput), testInput, "Objects should not be identical");
   ]]>
   </script>
 </window>