Have Permission{Manager,Service} use Origin.

content/public/browser/permission_manager.h

Index: content/public/browser/permission_manager.h
diff --git a/content/public/browser/permission_manager.h b/content/public/browser/permission_manager.h
index 9aa5e300be6aa9a6fa99bf85f2fb4c609d5916f0..497a662308c3b26ba457c68278c8653c1e1652b6 100644
--- a/content/public/browser/permission_manager.h
+++ b/content/public/browser/permission_manager.h
@@ -8,7 +8,9 @@
 #include "content/common/content_export.h"
 #include "content/public/common/permission_status.mojom.h"
 
-class GURL;
+namespace url {
+class Origin;
+}
 
 namespace content {
 enum class PermissionType;
@@ -36,7 +38,7 @@ class CONTENT_EXPORT PermissionManager {
   virtual int RequestPermission(
       PermissionType permission,
       RenderFrameHost* render_frame_host,
-      const GURL& requesting_origin,
+      const url::Origin& requesting_origin,
       const base::Callback<void(mojom::PermissionStatus)>& callback) = 0;
 
   // Requests multiple permissions on behalf of a frame identified by
@@ -52,7 +54,7 @@ class CONTENT_EXPORT PermissionManager {
   virtual int RequestPermissions(
       const std::vector<PermissionType>& permission,
       RenderFrameHost* render_frame_host,
-      const GURL& requesting_origin,
+      const url::Origin& requesting_origin,
       const base::Callback<void(const std::vector<mojom::PermissionStatus>&)>&
           callback) = 0;
 
@@ -66,20 +68,20 @@ class CONTENT_EXPORT PermissionManager {
   // outside of a frame context.
   virtual mojom::PermissionStatus GetPermissionStatus(
       PermissionType permission,
-      const GURL& requesting_origin,
-      const GURL& embedding_origin) = 0;
+      const url::Origin& requesting_origin,
+      const url::Origin& embedding_origin) = 0;
 
   // Sets the permission back to its default for the requesting_origin/
   // embedding_origin tuple.
   virtual void ResetPermission(PermissionType permission,
-                               const GURL& requesting_origin,
-                               const GURL& embedding_origin) = 0;
+                               const url::Origin& requesting_origin,
+                               const url::Origin& embedding_origin) = 0;
 
   // Registers a permission usage.
   // TODO(mlamouri): see if we can remove this from the PermissionManager.
   virtual void RegisterPermissionUsage(PermissionType permission,
-                                       const GURL& requesting_origin,
-                                       const GURL& embedding_origin) = 0;
+                                       const url::Origin& requesting_origin,
+                                       const url::Origin& embedding_origin) = 0;
 
   // Runs the given |callback| whenever the |permission| associated with the
   // pair { requesting_origin, embedding_origin } changes.
@@ -87,8 +89,8 @@ class CONTENT_EXPORT PermissionManager {
   // kNoPendingOperation if the subscribe was not successful.
   virtual int SubscribePermissionStatusChange(
       PermissionType permission,
-      const GURL& requesting_origin,
-      const GURL& embedding_origin,
+      const url::Origin& requesting_origin,
+      const url::Origin& embedding_origin,
       const base::Callback<void(mojom::PermissionStatus)>& callback) = 0;
 
   // Unregisters from permission status change notifications.