Have Permission{Manager,Service} use Origin.

chrome/browser/permissions/permission_manager.h

Index: chrome/browser/permissions/permission_manager.h
diff --git a/chrome/browser/permissions/permission_manager.h b/chrome/browser/permissions/permission_manager.h
index bbc2387dc35bbe61bef83e1fe8da8feb5e5e1b15..55a951d064465daaa06e5d1b1038fae2a8d53d00 100644
--- a/chrome/browser/permissions/permission_manager.h
+++ b/chrome/browser/permissions/permission_manager.h
@@ -19,7 +19,11 @@ class Profile;
 namespace content {
 enum class PermissionType;
 class WebContents;
-};  // namespace content
+}  // namespace content
+
+namespace url {
+class Origin;
+}  // namespace url
 
 class PermissionManager : public KeyedService,
                           public content::PermissionManager,
@@ -32,31 +36,31 @@ class PermissionManager : public KeyedService,
   int RequestPermission(
       content::PermissionType permission,
       content::RenderFrameHost* render_frame_host,
-      const GURL& requesting_origin,
+      const url::Origin& requesting_origin,
       const base::Callback<void(content::mojom::PermissionStatus)>& callback)
       override;
   int RequestPermissions(
       const std::vector<content::PermissionType>& permissions,
       content::RenderFrameHost* render_frame_host,
-      const GURL& requesting_origin,
+      const url::Origin& requesting_origin,
       const base::Callback<
           void(const std::vector<content::mojom::PermissionStatus>&)>& callback)
       override;
   void CancelPermissionRequest(int request_id) override;
   void ResetPermission(content::PermissionType permission,
-                       const GURL& requesting_origin,
-                       const GURL& embedding_origin) override;
+                       const url::Origin& requesting_origin,
+                       const url::Origin& embedding_origin) override;
   content::mojom::PermissionStatus GetPermissionStatus(
       content::PermissionType permission,
-      const GURL& requesting_origin,
-      const GURL& embedding_origin) override;
+      const url::Origin& requesting_origin,
+      const url::Origin& embedding_origin) override;
   void RegisterPermissionUsage(content::PermissionType permission,
-                               const GURL& requesting_origin,
-                               const GURL& embedding_origin) override;
+                               const url::Origin& requesting_origin,
+                               const url::Origin& embedding_origin) override;
   int SubscribePermissionStatusChange(
       content::PermissionType permission,
-      const GURL& requesting_origin,
-      const GURL& embedding_origin,
+      const url::Origin& requesting_origin,
+      const url::Origin& embedding_origin,
       const base::Callback<void(content::mojom::PermissionStatus)>& callback)
       override;
   void UnsubscribePermissionStatusChange(int subscription_id) override;