From 7ee058443af7d24ab2a85c1ccf46f82340f477fe Mon Sep 17 00:00:00 2001
From: Blake Kaplan <mrbkap@gmail.com>
Date: Mon, 21 Jun 2010 11:40:35 -0700
Subject: [PATCH] Backed out changeset 5e948055cc43

---
 js/src/xpconnect/src/xpcruntimesvc.cpp        | 14 ++++----------
 js/src/xpconnect/tests/unit/test_bug565230.js |  1 -
 2 files changed, 4 insertions(+), 11 deletions(-)
 delete mode 100644 js/src/xpconnect/tests/unit/test_bug565230.js

diff --git a/js/src/xpconnect/src/xpcruntimesvc.cpp b/js/src/xpconnect/src/xpcruntimesvc.cpp
index d7ef673244e..870c527532d 100644
--- a/js/src/xpconnect/src/xpcruntimesvc.cpp
+++ b/js/src/xpconnect/src/xpcruntimesvc.cpp
@@ -72,17 +72,11 @@ BackstagePass::NewResolve(nsIXPConnectWrappedNative *wrapper,
                           jsval id, PRUint32 flags, 
                           JSObject * *objp, PRBool *_retval)
 {
-    JSObject *realObj;
-    wrapper->GetJSObject(&realObj);
-
-    if(obj == realObj)
-    {
-        JSBool resolved;
-        *_retval = JS_ResolveStandardClass(cx, obj, id, &resolved);
-        if(*_retval && resolved)
-            *objp = obj;
-    }
+    JSBool resolved;
 
+    *_retval = JS_ResolveStandardClass(cx, obj, id, &resolved);
+    if(*_retval && resolved)
+        *objp = obj;
     return NS_OK;
 }
 
diff --git a/js/src/xpconnect/tests/unit/test_bug565230.js b/js/src/xpconnect/tests/unit/test_bug565230.js
deleted file mode 100644
index f6b4c8cf43c..00000000000
--- a/js/src/xpconnect/tests/unit/test_bug565230.js
+++ /dev/null
@@ -1 +0,0 @@
-do_check_eq(new XPCNativeWrapper(this).valueOf, undefined);