From c7de70479fd360e83ac76adc9afa1837441e3428 Mon Sep 17 00:00:00 2001
From: Boris Zbarsky <bzbarsky@mit.edu>
Date: Fri, 13 Feb 2015 14:34:53 -0500
Subject: [PATCH] Bug 1131887 part 2.  Remove the now-unused
 nsIXPConnect.reparentWrappedNativeIfFound.  r=peterv

---
 js/xpconnect/idl/nsIXPConnect.idl |  7 +------
 js/xpconnect/src/nsXPConnect.cpp  | 23 -----------------------
 2 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/js/xpconnect/idl/nsIXPConnect.idl b/js/xpconnect/idl/nsIXPConnect.idl
index d9d1295819a9..f2fb0d7f31e7 100644
--- a/js/xpconnect/idl/nsIXPConnect.idl
+++ b/js/xpconnect/idl/nsIXPConnect.idl
@@ -267,7 +267,7 @@ interface nsIXPCFunctionThisTranslator : nsISupports
     { 0xbd, 0xd6, 0x0, 0x0, 0x64, 0x65, 0x73, 0x74 } }
 %}
 
-[noscript, uuid(f0966cb3-9171-4dc6-a446-37ea16611fb0)]
+[noscript, uuid(75975244-2cf0-43b1-b79a-9fd447fac06b)]
 interface nsIXPConnect : nsISupports
 {
 %{ C++
@@ -466,11 +466,6 @@ interface nsIXPConnect : nsISupports
                               in nsIXPCFunctionThisTranslator aTranslator);
 
     void
-    reparentWrappedNativeIfFound(in JSContextPtr aJSContext,
-                                 in JSObjectPtr  aScope,
-                                 in JSObjectPtr  aNewParent,
-                                 in nsISupports  aCOMObj);
-    void
     rescueOrphansInScope(in JSContextPtr aJSContext, in JSObjectPtr  aScope);
 
     nsIXPConnectJSObjectHolder
diff --git a/js/xpconnect/src/nsXPConnect.cpp b/js/xpconnect/src/nsXPConnect.cpp
index fe1602058df1..0319e1bf4b5f 100644
--- a/js/xpconnect/src/nsXPConnect.cpp
+++ b/js/xpconnect/src/nsXPConnect.cpp
@@ -690,29 +690,6 @@ nsXPConnect::GetWrappedNativeOfNativeObject(JSContext * aJSContext,
     return NS_OK;
 }
 
-/* void reparentWrappedNativeIfFound (in JSContextPtr aJSContext,
- *                                    in JSObjectPtr aScope,
- *                                    in JSObjectPtr aNewParent,
- *                                    in nsISupports aCOMObj); */
-NS_IMETHODIMP
-nsXPConnect::ReparentWrappedNativeIfFound(JSContext * aJSContext,
-                                          JSObject * aScopeArg,
-                                          JSObject * aNewParentArg,
-                                          nsISupports *aCOMObj)
-{
-    RootedObject aScope(aJSContext, aScopeArg);
-    RootedObject aNewParent(aJSContext, aNewParentArg);
-
-    XPCWrappedNativeScope* scope = ObjectScope(aScope);
-    XPCWrappedNativeScope* scope2 = ObjectScope(aNewParent);
-    if (!scope || !scope2)
-        return UnexpectedFailure(NS_ERROR_FAILURE);
-
-    RootedObject newParent(aJSContext, aNewParent);
-    return XPCWrappedNative::
-        ReparentWrapperIfFound(scope, scope2, newParent, aCOMObj);
-}
-
 static PLDHashOperator
 MoveableWrapperFinder(PLDHashTable *table, PLDHashEntryHdr *hdr,
                       uint32_t number, void *arg)