Have Permission{Manager,Service} use Origin.

content/browser/permissions/permission_service_impl.h

Index: content/browser/permissions/permission_service_impl.h
diff --git a/content/browser/permissions/permission_service_impl.h b/content/browser/permissions/permission_service_impl.h
index 778cf18b79e51ee8ccf39fefe09bd42771d62154..6d0dcd5bae1aaae4b53247821f3964d5f06d2f4b 100644
--- a/content/browser/permissions/permission_service_impl.h
+++ b/content/browser/permissions/permission_service_impl.h
@@ -11,6 +11,7 @@
 #include "content/browser/permissions/permission_service_context.h"
 #include "content/common/permission_service.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "url/origin.h"
 
 namespace content {
 
@@ -58,14 +59,15 @@ class PermissionServiceImpl : public mojom::PermissionService {
   using RequestsMap = IDMap<PendingRequest, IDMapOwnPointer>;
 
   struct PendingSubscription {
-    PendingSubscription(PermissionType permission, const GURL& origin,
+    PendingSubscription(PermissionType permission,
+                        const url::Origin& origin,
                         const PermissionStatusCallback& callback);
     ~PendingSubscription();
 
     // Subscription ID received from the PermissionManager.
     int id;
     PermissionType permission;
-    GURL origin;
+    url::Origin origin;
     PermissionStatusCallback callback;
   };
   using SubscriptionsMap = IDMap<PendingSubscription, IDMapOwnPointer>;
@@ -99,10 +101,11 @@ class PermissionServiceImpl : public mojom::PermissionService {
 
   mojom::PermissionStatus GetPermissionStatusFromName(
       mojom::PermissionName permission,
-      const GURL& origin);
-  mojom::PermissionStatus GetPermissionStatusFromType(PermissionType type,
-                                                      const GURL& origin);
-  void ResetPermissionStatus(PermissionType type, const GURL& origin);
+      const url::Origin& origin);
+  mojom::PermissionStatus GetPermissionStatusFromType(
+      PermissionType type,
+      const url::Origin& origin);
+  void ResetPermissionStatus(PermissionType type, const url::Origin& origin);
 
   void OnPermissionStatusChanged(int pending_subscription_id,
                                  mojom::PermissionStatus status);