Bug 959485, part 5 - Remove success from nsJSCID::NewID. r=gabor

js/xpconnect/src/XPCJSID.cpp

@@ -617,24 +617,21 @@ nsJSCID::NewID(const char* str)
     }
 
     nsRefPtr<nsJSCID> idObj = new nsJSCID();
-    bool success = false;
-
     if (str[0] == '{') {
-        if (NS_SUCCEEDED(idObj->Initialize(str)))
-            success = true;
+        NS_ENSURE_SUCCESS(idObj->Initialize(str), nullptr);
     } else {
         nsCOMPtr<nsIComponentRegistrar> registrar;
         NS_GetComponentRegistrar(getter_AddRefs(registrar));
         if (registrar) {
             nsCID *cid;
             if (NS_SUCCEEDED(registrar->ContractIDToCID(str, &cid))) {
-                success = idObj->mDetails.InitWithName(*cid, str);
+                bool success = idObj->mDetails.InitWithName(*cid, str);
                 nsMemory::Free(cid);
+                if (!success)
+                    return nullptr;
             }
         }
     }
-    if (!success)
-        return nullptr;
     return idObj.forget();
 }