Have Permission{Manager,Service} use Origin.

chrome/browser/media/protected_media_identifier_permission_context.cc

Index: chrome/browser/media/protected_media_identifier_permission_context.cc
diff --git a/chrome/browser/media/protected_media_identifier_permission_context.cc b/chrome/browser/media/protected_media_identifier_permission_context.cc
index 99a9edf9a6fa370ebbb62a680c037644fd4d2338..adbc0792a323764a86640dc96008d7bd7924453a 100644
--- a/chrome/browser/media/protected_media_identifier_permission_context.cc
+++ b/chrome/browser/media/protected_media_identifier_permission_context.cc
@@ -55,7 +55,7 @@ ProtectedMediaIdentifierPermissionContext::
 void ProtectedMediaIdentifierPermissionContext::RequestPermission(
     content::WebContents* web_contents,
     const PermissionRequestID& id,
-    const GURL& requesting_origin,
+    const url::Origin& requesting_origin,
     const BrowserPermissionCallback& callback) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
@@ -81,10 +81,10 @@ void ProtectedMediaIdentifierPermissionContext::RequestPermission(
     return;
   }
 
-  GURL embedding_origin = web_contents->GetLastCommittedURL().GetOrigin();
+  const url::Origin embedding_origin(web_contents->GetLastCommittedURL());
 
-  DVLOG(1) << __FUNCTION__ << ": (" << requesting_origin.spec() << ", "
-           << embedding_origin.spec() << ")";
+  DVLOG(1) << __FUNCTION__ << ": (" << requesting_origin << ", "
+           << embedding_origin << ")";
 
   ContentSetting content_setting =
       GetPermissionStatus(requesting_origin, embedding_origin);
@@ -110,8 +110,9 @@ void ProtectedMediaIdentifierPermissionContext::RequestPermission(
   // uses the standard permission infobar/bubble UI. See http://crbug.com/454847
   // Instead, we show the existing platform verification UI.
   // TODO(xhwang): Remove when http://crbug.com/454847 is fixed.
+  const GURL requesting_url(requesting_origin.Serialize());
   views::Widget* widget = PlatformVerificationDialog::ShowDialog(
-      web_contents, requesting_origin,
+      web_contents, requesting_url,
       base::Bind(&ProtectedMediaIdentifierPermissionContext::
                      OnPlatformVerificationConsentResponse,
                  weak_factory_.GetWeakPtr(), web_contents, id,
@@ -122,12 +123,12 @@ void ProtectedMediaIdentifierPermissionContext::RequestPermission(
 #endif  // defined(OS_CHROMEOS)
 
 ContentSetting ProtectedMediaIdentifierPermissionContext::GetPermissionStatus(
-      const GURL& requesting_origin,
-      const GURL& embedding_origin) const {
-  DVLOG(1) << __FUNCTION__ << ": (" << requesting_origin.spec() << ", "
-           << embedding_origin.spec() << ")";
+    const url::Origin& requesting_origin,
+    const url::Origin& embedding_origin) const {
+  DVLOG(1) << __FUNCTION__ << ": (" << requesting_origin.Serialize() << ", "
+           << embedding_origin.Serialize() << ")";
 
-  if (!requesting_origin.is_valid() || !embedding_origin.is_valid() ||
+  if (requesting_origin.unique() || embedding_origin.unique() ||
       !IsProtectedMediaIdentifierEnabled()) {
     return CONTENT_SETTING_BLOCK;
   }
@@ -168,7 +169,7 @@ void ProtectedMediaIdentifierPermissionContext::CancelPermissionRequest(
 
 void ProtectedMediaIdentifierPermissionContext::UpdateTabContext(
     const PermissionRequestID& id,
-    const GURL& requesting_frame,
+    const url::Origin& requesting_frame,
     bool allowed) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
@@ -177,8 +178,9 @@ void ProtectedMediaIdentifierPermissionContext::UpdateTabContext(
       TabSpecificContentSettings::GetForFrame(id.render_process_id(),
                                               id.render_frame_id());
   if (content_settings) {
-    content_settings->OnProtectedMediaIdentifierPermissionSet(
-        requesting_frame.GetOrigin(), allowed);
+    const GURL requesting_url(requesting_frame.Serialize());
+    content_settings->OnProtectedMediaIdentifierPermissionSet(requesting_url,
+                                                              allowed);
   }
 }
 
@@ -227,8 +229,8 @@ void ProtectedMediaIdentifierPermissionContext::
     OnPlatformVerificationConsentResponse(
         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,
         PlatformVerificationDialog::ConsentResponse response) {
   // The request may have been canceled. Drop the callback in that case.