Have Permission{Manager,Service} use Origin.

chrome/browser/storage/durable_storage_permission_context.h

Index: chrome/browser/storage/durable_storage_permission_context.h
diff --git a/chrome/browser/storage/durable_storage_permission_context.h b/chrome/browser/storage/durable_storage_permission_context.h
index 63d8df51ee5d134c96587b9a0eba5df0a680d764..f5855fee835c91d6b67b06aaa7d3f969f8373773 100644
--- a/chrome/browser/storage/durable_storage_permission_context.h
+++ b/chrome/browser/storage/durable_storage_permission_context.h
@@ -20,11 +20,11 @@ class DurableStoragePermissionContext : public PermissionContextBase {
   // Grant if requesting_origin is bookmarked or already granted.
   void DecidePermission(content::WebContents* web_contents,
                         const PermissionRequestID& id,
-                        const GURL& requesting_origin,
-                        const GURL& embedding_origin,
+                        const url::Origin& requesting_origin,
+                        const url::Origin& embedding_origin,
                         const BrowserPermissionCallback& callback) override;
-  void UpdateContentSetting(const GURL& requesting_origin,
-                            const GURL& embedding_origin,
+  void UpdateContentSetting(const url::Origin& requesting_origin,
+                            const url::Origin& embedding_origin,
                             ContentSetting content_setting) override;
   bool IsRestrictedToSecureOrigins() const override;