Bug 880089 - Remove unused parameter 'flags' from nsIXPConnect.idl's in setDefaultSecurityManager() methods correctly. r=bholley

caps/src/nsScriptSecurityManager.cpp

@@ -2510,8 +2510,7 @@ nsScriptSecurityManager::GetScriptSecurityManager()
         }
  
         rv = nsXPConnect::XPConnect()->
-            SetDefaultSecurityManager(ssManager,
-                                      nsIXPCSecurityManager::HOOK_ALL);
+            SetDefaultSecurityManager(ssManager);
         if (NS_FAILED(rv)) {
             NS_WARNING("Failed to install xpconnect security manager!");
             return nullptr;

js/xpconnect/idl/nsIXPCSecurityManager.idl

@@ -23,24 +23,6 @@ interface nsIClassInfo;
 [uuid(31431440-f1ce-11d2-985a-006008962422)]
 interface nsIXPCSecurityManager : nsISupports
 {
-    /**
-    * These flags are used when calling nsIXPConnect::SetSecurityManager
-    */
-
-    const uint32_t HOOK_CREATE_WRAPPER  = 1 << 0;
-    const uint32_t HOOK_CREATE_INSTANCE = 1 << 1;
-    const uint32_t HOOK_GET_SERVICE     = 1 << 2;
-    const uint32_t HOOK_CALL_METHOD     = 1 << 3;
-    const uint32_t HOOK_GET_PROPERTY    = 1 << 4;
-    const uint32_t HOOK_SET_PROPERTY    = 1 << 5;
-
-    const uint32_t HOOK_ALL             = HOOK_CREATE_WRAPPER  |
-                                          HOOK_CREATE_INSTANCE |
-                                          HOOK_GET_SERVICE     |
-                                          HOOK_CALL_METHOD     |
-                                          HOOK_GET_PROPERTY    |
-                                          HOOK_SET_PROPERTY    ;
-
     /**
     * For each of these hooks returning NS_OK means 'let the action continue'.
     * Returning an error code means 'veto the action'. XPConnect will return

js/xpconnect/idl/nsIXPConnect.idl

@@ -291,7 +291,7 @@ interface nsIXPCFunctionThisTranslator : nsISupports
     { 0xbd, 0xd6, 0x0, 0x0, 0x64, 0x65, 0x73, 0x74 } }
 %}
 
-[uuid(8c85f21e-c28b-4a78-89cf-f5682d0c357a)]
+[uuid(2950bc62-ba03-4465-9685-a0eec9e188c2)]
 interface nsIXPConnect : nsISupports
 {
 %{ C++
@@ -444,8 +444,7 @@ interface nsIXPConnect : nsISupports
     * The security manager to use when the current JSContext has no security
     * manager.
     */
-    void setDefaultSecurityManager(in nsIXPCSecurityManager aManager,
-                                   in uint16_t flags);
+    void setDefaultSecurityManager(in nsIXPCSecurityManager aManager);
 
     nsIStackFrame
     createStackFrameLocation(in uint32_t       aLanguage,

js/xpconnect/src/nsXPConnect.cpp

@@ -84,7 +84,6 @@ const char XPC_XPCONNECT_CONTRACTID[]     = "@mozilla.org/js/xpc/XPConnect;1";
 nsXPConnect::nsXPConnect()
     :   mRuntime(nullptr),
         mDefaultSecurityManager(nullptr),
-        mDefaultSecurityManagerFlags(0),
         mShuttingDown(false),
         mEventDepth(0)
 {
@@ -1380,15 +1379,13 @@ nsXPConnect::RescueOrphansInScope(JSContext *aJSContext, JSObject *aScopeArg)
     return NS_OK;
 }
 
-/* void setDefaultSecurityManager (in nsIXPCSecurityManager aManager, in uint16_t flags); */
+/* void setDefaultSecurityManager (in nsIXPCSecurityManager aManager); */
 NS_IMETHODIMP
-nsXPConnect::SetDefaultSecurityManager(nsIXPCSecurityManager *aManager,
-                                       uint16_t flags)
+nsXPConnect::SetDefaultSecurityManager(nsIXPCSecurityManager *aManager)
 {
     NS_IF_ADDREF(aManager);
     NS_IF_RELEASE(mDefaultSecurityManager);
     mDefaultSecurityManager = aManager;
-    mDefaultSecurityManagerFlags = flags;
 
     nsCOMPtr<nsIScriptSecurityManager> ssm =
         do_QueryInterface(mDefaultSecurityManager);
@@ -1596,7 +1593,6 @@ nsXPConnect::DebugDump(int16_t depth)
         XPC_LOG_ALWAYS(("gSelf @ %x", gSelf));
         XPC_LOG_ALWAYS(("gOnceAliveNowDead is %d", (int)gOnceAliveNowDead));
         XPC_LOG_ALWAYS(("mDefaultSecurityManager @ %x", mDefaultSecurityManager));
-        XPC_LOG_ALWAYS(("mDefaultSecurityManagerFlags of %x", mDefaultSecurityManagerFlags));
         if (mRuntime) {
             if (depth)
                 mRuntime->DebugDump(depth);

js/xpconnect/src/xpcprivate.h

@@ -507,9 +507,6 @@ public:
         return mDefaultSecurityManager;
     }
 
-    uint16_t GetDefaultSecurityManagerFlags() const
-        {return mDefaultSecurityManagerFlags;}
-
     // This returns an AddRef'd pointer. It does not do this with an 'out' param
     // only because this form is required by the generic module macro:
     // NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR
@@ -571,7 +568,6 @@ private:
 
     XPCJSRuntime*            mRuntime;
     nsIXPCSecurityManager*   mDefaultSecurityManager;
-    uint16_t                 mDefaultSecurityManagerFlags;
     JSBool                   mShuttingDown;
 
     // nsIThreadInternal doesn't remember which observers it called