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..64fb0619a342979a360bbec09db0fa83ceb2688e 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);
@@ -122,8 +122,8 @@ void ProtectedMediaIdentifierPermissionContext::RequestPermission(
 #endif  // defined(OS_CHROMEOS)
 
 ContentSetting ProtectedMediaIdentifierPermissionContext::GetPermissionStatus(
-      const GURL& requesting_origin,
-      const GURL& embedding_origin) const {
+    const url::Origin& requesting_origin,
+    const url::Origin& embedding_origin) const {
   DVLOG(1) << __FUNCTION__ << ": (" << requesting_origin.spec() << ", "
            << embedding_origin.spec() << ")";
 
@@ -168,7 +168,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);
 
@@ -227,8 +227,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.