Bug 1596843 - Part 2: Stop exposing nsIPermissionManager.removePermissionsWithAttributes(); r=baku

Differential Revision: https://phabricator.services.mozilla.com/D53238

--HG--
extra : moz-landing-system : lando

extensions/permissions/nsPermissionManager.cpp

@@ -2622,8 +2622,7 @@ nsresult nsPermissionManager::RemoveAllModifiedSince(
       });
 }
 
-NS_IMETHODIMP
-nsPermissionManager::RemovePermissionsWithAttributes(
+nsresult nsPermissionManager::RemovePermissionsWithAttributes(
     const nsAString& aPattern) {
   ENSURE_NOT_CHILD_PROCESS;
   mozilla::OriginAttributesPattern pattern;

extensions/permissions/nsPermissionManager.h

@@ -206,9 +206,6 @@ class nsPermissionManager final : public nsIPermissionManager,
    */
   static void Startup();
 
-  nsresult RemovePermissionsWithAttributes(
-      mozilla::OriginAttributesPattern& aAttrs);
-
   /**
    * See `nsIPermissionManager::GetPermissionsWithKey` for more info on
    * permission keys.
@@ -527,6 +524,10 @@ class nsPermissionManager final : public nsIPermissionManager,
   template <class T>
   nsresult RemovePermissionEntries(T aCondition);
 
+  nsresult RemovePermissionsWithAttributes(const nsAString& aPattern);
+  nsresult RemovePermissionsWithAttributes(
+      mozilla::OriginAttributesPattern& aAttrs);
+
   nsRefPtrHashtable<nsCStringHashKey,
                     mozilla::GenericNonExclusivePromise::Private>
       mPermissionKeyPromiseMap;

netwerk/base/nsIPermissionManager.idl

@@ -198,11 +198,6 @@ interface nsIPermissionManager : nsISupports
    */
   readonly attribute Array<nsIPermission> all;
 
-  /**
-   * Remove all permissions that will match the origin pattern.
-   */
-  void removePermissionsWithAttributes(in AString patternAsJSON);
-
   /**
    * If the current permission is set to expire, reset the expiration time. If
    * there is no permission or the current permission does not expire, this