Bug 1363541 - Modernize the PermissionManager - part 2 - PermissionDelegateHandler to mozilla::PermissionDelegateHandler, r=timhuang

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

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

dom/base/Document.cpp

@@ -91,7 +91,7 @@
 #include "nsINSSErrorsService.h"
 #include "nsISocketProvider.h"
 #include "nsISiteSecurityService.h"
-#include "PermissionDelegateHandler.h"
+#include "mozilla/PermissionDelegateHandler.h"
 
 #include "mozilla/AsyncEventDispatcher.h"
 #include "mozilla/BasicEvents.h"
@@ -6823,7 +6823,8 @@ void Document::SetScopeObject(nsIGlobalObject* aGlobal) {
     if (!window) {
       return;
     }
-    BrowsingContextGroup* browsingContextGroup = window->GetBrowsingContextGroup();
+    BrowsingContextGroup* browsingContextGroup =
+        window->GetBrowsingContextGroup();
 
     // We should already have the principal, and now that we have been added
     // to a window, we should be able to join a DocGroup!

dom/base/Document.h

@@ -128,7 +128,6 @@ class nsIGlobalObject;
 class nsIAppWindow;
 class nsXULPrototypeDocument;
 class nsXULPrototypeElement;
-class PermissionDelegateHandler;
 class nsIPermissionDelegateHandler;
 struct nsFont;
 struct StyleUseCounters;
@@ -145,6 +144,7 @@ class FullscreenExit;
 class FullscreenRequest;
 struct LangGroupFontPrefs;
 class PendingAnimationTracker;
+class PermissionDelegateHandler;
 class PresShell;
 class ServoStyleSet;
 enum class StyleOrigin : uint8_t;

dom/base/Navigator.cpp

@@ -73,7 +73,7 @@
 #include "WidgetUtils.h"
 #include "nsIScriptError.h"
 #include "ReferrerInfo.h"
-#include "PermissionDelegateHandler.h"
+#include "mozilla/PermissionDelegateHandler.h"
 
 #include "nsIExternalProtocolHandler.h"
 #include "BrowserChild.h"

dom/base/nsContentPermissionHelper.h

@@ -12,7 +12,7 @@
 #include "nsIMutableArray.h"
 #include "mozilla/dom/PContentPermissionRequestChild.h"
 #include "mozilla/dom/ipc/IdType.h"
-#include "PermissionDelegateHandler.h"
+#include "mozilla/PermissionDelegateHandler.h"
 
 // Microsoft's API Name hackery sucks
 // XXXbz Doing this in a header is a gigantic footgun. See

dom/media/MediaManager.cpp

@@ -32,6 +32,7 @@
 #include "mozilla/MozPromise.h"
 #include "mozilla/NullPrincipal.h"
 #include "mozilla/PeerIdentity.h"
+#include "mozilla/PermissionDelegateHandler.h"
 #include "mozilla/Sprintf.h"
 #include "mozilla/StaticPrefs_media.h"
 #include "mozilla/Telemetry.h"
@@ -55,7 +56,6 @@
 #include "nsProxyRelease.h"
 #include "nss.h"
 #include "nsVariant.h"
-#include "PermissionDelegateHandler.h"
 #include "pk11pub.h"
 #include "ThreadSafeRefcountingWithMainThreadDestruction.h"
 #include "VideoStreamTrack.h"

dom/permission/PermissionStatus.cpp

@@ -5,6 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/PermissionStatus.h"
+#include "mozilla/PermissionDelegateHandler.h"
 
 #include "mozilla/AsyncEventDispatcher.h"
 #include "mozilla/Permission.h"
@@ -12,7 +13,6 @@
 #include "nsIPermissionManager.h"
 #include "PermissionObserver.h"
 #include "PermissionUtils.h"
-#include "PermissionDelegateHandler.h"
 
 namespace mozilla {
 namespace dom {

extensions/permissions/PermissionDelegateHandler.cpp

@@ -4,8 +4,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "mozilla/PermissionDelegateHandler.h"
+
 #include "nsGlobalWindowInner.h"
-#include "PermissionDelegateHandler.h"
 #include "nsPIDOMWindow.h"
 #include "nsPermissionManager.h"
 #include "nsIPrincipal.h"
@@ -16,8 +17,10 @@
 #include "mozilla/dom/Document.h"
 #include "mozilla/dom/FeaturePolicyUtils.h"
 
-using namespace mozilla;
 using namespace mozilla::dom;
+
+namespace mozilla {
+
 typedef PermissionDelegateHandler::PermissionDelegatePolicy DelegatePolicy;
 typedef PermissionDelegateHandler::PermissionDelegateInfo DelegateInfo;
 
@@ -242,3 +245,5 @@ nsresult PermissionDelegateHandler::GetPermissionForPermissionsAPI(
     const nsACString& aType, uint32_t* aPermission) {
   return GetPermission(aType, aPermission, false);
 }
+
+}  // namespace mozilla

extensions/permissions/PermissionDelegateHandler.h

@@ -23,8 +23,8 @@
  * prompt using of the top-level origin.
  */
 
-#ifndef PermissionDelegateHandler_h__
-#define PermissionDelegateHandler_h__
+#ifndef mozilla_PermissionDelegateHandler_h
+#define mozilla_PermissionDelegateHandler_h
 
 #include "nsISupports.h"
 #include "nsIPermissionDelegateHandler.h"
@@ -36,7 +36,6 @@ namespace mozilla {
 namespace dom {
 class Document;
 }
-}  // namespace mozilla
 
 class PermissionDelegateHandler final : public nsIPermissionDelegateHandler {
  public:
@@ -162,4 +161,6 @@ class PermissionDelegateHandler final : public nsIPermissionDelegateHandler {
   RefPtr<nsIPermissionManager> mPermissionManager;
 };
 
-#endif  // PermissionDelegateHandler_h__
+}  // namespace mozilla
+
+#endif  // mozilla_PermissionDelegateHandler_h

extensions/permissions/moz.build

@@ -10,12 +10,9 @@ TESTING_JS_MODULES += [
     'test/PermissionTestUtils.jsm',
 ]
 
-EXPORTS += [
-    'PermissionDelegateHandler.h',
-]
-
 EXPORTS.mozilla += [
     'Permission.h',
+    'PermissionDelegateHandler.h',
 ]
 
 UNIFIED_SOURCES += [