Bug 873735 part 2. Change nsIXPConnectJSObjectHolder::GetJSObject to return a JSObject*. r=bholley

2013-05-20 08:44:18 -04:00
parent 41ec301773
commit d0259d836d
32 changed files with 128 additions and 166 deletions
--- a/ipc/testshell/XPCShellEnvironment.cpp
+++ b/ipc/testshell/XPCShellEnvironment.cpp
@@ -1026,9 +1026,8 @@ XPCShellEnvironment::Init()
        return false;
    }

-    JS::Rooted<JSObject*> globalObj(cx);
-    rv = holder->GetJSObject(globalObj.address());
-    if (NS_FAILED(rv)) {
+    JS::Rooted<JSObject*> globalObj(cx, holder->GetJSObject());
+    if (!globalObj) {
        NS_ERROR("Failed to get global JSObject!");
        return false;
    }