Have Permission{Manager,Service} use Origin.

content/shell/browser/layout_test/layout_test_permission_manager.cc

Index: content/shell/browser/layout_test/layout_test_permission_manager.cc
diff --git a/content/shell/browser/layout_test/layout_test_permission_manager.cc b/content/shell/browser/layout_test/layout_test_permission_manager.cc
index 7b31f37bb7d237dc95a8e3ff7743ee2965a9a6b7..ce717df8c275f4cab94a0e08dd317d7fa69071c9 100644
--- a/content/shell/browser/layout_test/layout_test_permission_manager.cc
+++ b/content/shell/browser/layout_test/layout_test_permission_manager.cc
@@ -24,12 +24,9 @@ struct LayoutTestPermissionManager::Subscription {
 
 LayoutTestPermissionManager::PermissionDescription::PermissionDescription(
     PermissionType type,
-    const GURL& origin,
-    const GURL& embedding_origin)
-    : type(type),
-      origin(origin),
-      embedding_origin(embedding_origin) {
-}
+    const url::Origin& origin,
+    const url::Origin& embedding_origin)
+    : type(type), origin(origin), embedding_origin(embedding_origin) {}
 
 bool LayoutTestPermissionManager::PermissionDescription::operator==(
     const PermissionDescription& other) const {
@@ -48,9 +45,9 @@ size_t LayoutTestPermissionManager::PermissionDescription::Hash::operator()(
   size_t hash = BASE_HASH_NAMESPACE::hash<int>()(static_cast<int>(
       description.type));
   hash += BASE_HASH_NAMESPACE::hash<std::string>()(
-      description.embedding_origin.spec());
-  hash += BASE_HASH_NAMESPACE::hash<std::string>()(
-      description.origin.spec());
+      description.embedding_origin.Serialize());
+  hash +=
+      BASE_HASH_NAMESPACE::hash<std::string>()(description.origin.Serialize());
   return hash;
 }
 
@@ -64,29 +61,29 @@ LayoutTestPermissionManager::~LayoutTestPermissionManager() {
 int LayoutTestPermissionManager::RequestPermission(
     PermissionType permission,
     RenderFrameHost* render_frame_host,
-    const GURL& requesting_origin,
+    const url::Origin& requesting_origin,
     const base::Callback<void(mojom::PermissionStatus)>& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   callback.Run(GetPermissionStatus(
       permission, requesting_origin,
-      WebContents::FromRenderFrameHost(render_frame_host)
-          ->GetLastCommittedURL().GetOrigin()));
+      url::Origin(WebContents::FromRenderFrameHost(render_frame_host)
+                      ->GetLastCommittedURL())));
   return kNoPendingOperation;
 }
 
 int LayoutTestPermissionManager::RequestPermissions(
     const std::vector<PermissionType>& permissions,
     content::RenderFrameHost* render_frame_host,
-    const GURL& requesting_origin,
+    const url::Origin& requesting_origin,
     const base::Callback<void(const std::vector<mojom::PermissionStatus>&)>&
         callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   std::vector<mojom::PermissionStatus> result(permissions.size());
-  const GURL& embedding_origin =
+  const url::Origin embedding_origin(
       WebContents::FromRenderFrameHost(render_frame_host)
-          ->GetLastCommittedURL().GetOrigin();
+          ->GetLastCommittedURL());
   for (const auto& permission : permissions) {
     result.push_back(GetPermissionStatus(
         permission, requesting_origin, embedding_origin));
@@ -102,8 +99,8 @@ void LayoutTestPermissionManager::CancelPermissionRequest(int request_id) {
 
 void LayoutTestPermissionManager::ResetPermission(
     PermissionType permission,
-    const GURL& requesting_origin,
-    const GURL& embedding_origin) {
+    const url::Origin& requesting_origin,
+    const url::Origin& embedding_origin) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   base::AutoLock lock(permissions_lock_);
@@ -117,8 +114,8 @@ void LayoutTestPermissionManager::ResetPermission(
 
 mojom::PermissionStatus LayoutTestPermissionManager::GetPermissionStatus(
     PermissionType permission,
-    const GURL& requesting_origin,
-    const GURL& embedding_origin) {
+    const url::Origin& requesting_origin,
+    const url::Origin& embedding_origin) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::IO));
 
@@ -133,15 +130,15 @@ mojom::PermissionStatus LayoutTestPermissionManager::GetPermissionStatus(
 
 void LayoutTestPermissionManager::RegisterPermissionUsage(
     PermissionType permission,
-    const GURL& requesting_origin,
-    const GURL& embedding_origin) {
+    const url::Origin& requesting_origin,
+    const url::Origin& embedding_origin) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 }
 
 int LayoutTestPermissionManager::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) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
@@ -165,10 +162,11 @@ void LayoutTestPermissionManager::UnsubscribePermissionStatusChange(
   subscriptions_.Remove(subscription_id);
 }
 
-void LayoutTestPermissionManager::SetPermission(PermissionType permission,
-                                                mojom::PermissionStatus status,
-                                                const GURL& origin,
-                                                const GURL& embedding_origin) {
+void LayoutTestPermissionManager::SetPermission(
+    PermissionType permission,
+    mojom::PermissionStatus status,
+    const url::Origin& origin,
+    const url::Origin& embedding_origin) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   PermissionDescription description(permission, origin, embedding_origin);