Have Permission{Manager,Service} use Origin.

content/browser/permissions/permission_service_impl.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_PERMISSIONS_PERMISSION_SERVICE_IMPL_H_
 #define CONTENT_BROWSER_PERMISSIONS_PERMISSION_SERVICE_IMPL_H_
 
 #include "base/id_map.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "content/browser/permissions/permission_service_context.h"
 #include "content/common/permission_service.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
+#include "url/origin.h"
 
 namespace content {
 
 enum class PermissionType;
 
 // Implements the mojom::PermissionService Mojo interface.
 // This service can be created from a RenderFrameHost or a RenderProcessHost.
 // It is owned by a PermissionServiceContext.
 // It receives at PermissionServiceContext instance when created which allows it
 // to have some information about the current context. That enables the service
@@ skipping 27 matching lines @@
     ~PendingRequest();
 
     // Request ID received from the PermissionManager.
     int id;
     PermissionsStatusCallback callback;
     int request_count;
   };
   using RequestsMap = IDMap<PendingRequest, IDMapOwnPointer>;
 
   struct PendingSubscription {
-    PendingSubscription(PermissionType permission, const GURL& origin,
+    PendingSubscription(PermissionType permission,
+                        const url::Origin& origin,
                         const PermissionStatusCallback& callback);
     ~PendingSubscription();
 
     // Subscription ID received from the PermissionManager.
     int id;
     PermissionType permission;
-    GURL origin;
+    url::Origin origin;
     PermissionStatusCallback callback;
   };
   using SubscriptionsMap = IDMap<PendingSubscription, IDMapOwnPointer>;
 
   // PermissionService.
   void HasPermission(mojom::PermissionName permission,
                      const mojo::String& origin,
                      const PermissionStatusCallback& callback) override;
   void RequestPermission(mojom::PermissionName permission,
                          const mojo::String& origin,
@@ skipping 13 matching lines @@
   void OnConnectionError();
 
   void OnRequestPermissionResponse(int pending_request_id,
                                    mojom::PermissionStatus status);
   void OnRequestPermissionsResponse(
       int pending_request_id,
       const std::vector<mojom::PermissionStatus>& result);
 
   mojom::PermissionStatus GetPermissionStatusFromName(
       mojom::PermissionName permission,
-      const GURL& origin);
-  mojom::PermissionStatus GetPermissionStatusFromType(PermissionType type,
-                                                      const GURL& origin);
-  void ResetPermissionStatus(PermissionType type, const GURL& origin);
+      const url::Origin& origin);
+  mojom::PermissionStatus GetPermissionStatusFromType(
+      PermissionType type,
+      const url::Origin& origin);
+  void ResetPermissionStatus(PermissionType type, const url::Origin& origin);
 
   void OnPermissionStatusChanged(int pending_subscription_id,
                                  mojom::PermissionStatus status);
 
   RequestsMap pending_requests_;
   SubscriptionsMap pending_subscriptions_;
   // context_ owns |this|.
   PermissionServiceContext* context_;
   mojo::Binding<mojom::PermissionService> binding_;
   base::WeakPtrFactory<PermissionServiceImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionServiceImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_PERMISSIONS_PERMISSION_SERVICE_IMPL_H_