Have Permission{Manager,Service} use Origin.

content/shell/browser/layout_test/layout_test_permission_manager.h

Index: content/shell/browser/layout_test/layout_test_permission_manager.h
diff --git a/content/shell/browser/layout_test/layout_test_permission_manager.h b/content/shell/browser/layout_test/layout_test_permission_manager.h
index 4d9ef411416600606d978a9ef04ae36354dbdafb..4dba2db5985b0dec7f5c8539f348bce1539f48dc 100644
--- a/content/shell/browser/layout_test/layout_test_permission_manager.h
+++ b/content/shell/browser/layout_test/layout_test_permission_manager.h
@@ -13,7 +13,7 @@
 #include "base/macros.h"
 #include "base/synchronization/lock.h"
 #include "content/public/browser/permission_manager.h"
-#include "url/gurl.h"
+#include "url/origin.h"
 
 namespace content {
 
@@ -26,36 +26,36 @@ class LayoutTestPermissionManager : 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;
 
   void SetPermission(PermissionType permission,
                      mojom::PermissionStatus status,
-                     const GURL& origin,
-                     const GURL& embedding_origin);
+                     const url::Origin& origin,
+                     const url::Origin& embedding_origin);
   void ResetPermissions();
 
  private:
@@ -63,8 +63,8 @@ class LayoutTestPermissionManager : public PermissionManager {
   struct PermissionDescription {
     PermissionDescription() = default;
     PermissionDescription(PermissionType type,
-                          const GURL& origin,
-                          const GURL& embedding_origin);
+                          const url::Origin& origin,
+                          const url::Origin& embedding_origin);
     bool operator==(const PermissionDescription& other) const;
     bool operator!=(const PermissionDescription& other) const;
 
@@ -74,8 +74,8 @@ class LayoutTestPermissionManager : public PermissionManager {
     };
 
     PermissionType type;
-    GURL origin;
-    GURL embedding_origin;
+    url::Origin origin;
+    url::Origin embedding_origin;
   };
 
   struct Subscription;