Have Permission{Manager,Service} use Origin.

content/shell/browser/shell_permission_manager.h

Index: content/shell/browser/shell_permission_manager.h
diff --git a/content/shell/browser/shell_permission_manager.h b/content/shell/browser/shell_permission_manager.h
index 79333afe888a84b3df4af9acb1191af24df00489..016cfc1823fba4f02ea9ba5185bbb8aa62abeab3 100644
--- a/content/shell/browser/shell_permission_manager.h
+++ b/content/shell/browser/shell_permission_manager.h
@@ -9,6 +9,10 @@
 #include "base/macros.h"
 #include "content/public/browser/permission_manager.h"
 
+namespace url {
+class Origin;
+}
+
 namespace content {
 
 class ShellPermissionManager : public PermissionManager {
@@ -20,29 +24,29 @@ class ShellPermissionManager : public PermissionManager {
   int RequestPermission(
       PermissionType permission,
       RenderFrameHost* render_frame_host,
-      const GURL& requesting_origin,
+      const url::Origin& requesting_origin,
       const base::Callback<void(mojom::PermissionStatus)>& callback) override;
   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) override;
   void CancelPermissionRequest(int request_id) override;
   void ResetPermission(PermissionType permission,
-                       const GURL& requesting_origin,
-                       const GURL& embedding_origin) override;
+                       const url::Origin& requesting_origin,
+                       const url::Origin& embedding_origin) override;
   mojom::PermissionStatus GetPermissionStatus(
       PermissionType permission,
-      const GURL& requesting_origin,
-      const GURL& embedding_origin) override;
+      const url::Origin& requesting_origin,
+      const url::Origin& embedding_origin) override;
   void RegisterPermissionUsage(PermissionType permission,
-                               const GURL& requesting_origin,
-                               const GURL& embedding_origin) override;
+                               const url::Origin& requesting_origin,
+                               const url::Origin& embedding_origin) override;
   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) override;
   void UnsubscribePermissionStatusChange(int subscription_id) override;