Have Permission{Manager,Service} use Origin.

content/browser/media/cdm/browser_cdm_manager.cc

 // 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.
 
 #include "content/browser/media/cdm/browser_cdm_manager.h"
 
 #include <stddef.h>
 #include <string>
 #include <utility>
 
@@ skipping 655 matching lines @@
   WebContents* web_contents = WebContents::FromRenderFrameHost(rfh);
   PermissionManager* permission_manager =
       web_contents->GetBrowserContext()->GetPermissionManager();
   if (!permission_manager) {
     permission_status_cb.Run(false);
     return;
   }
 
   mojom::PermissionStatus permission_status =
       permission_manager->GetPermissionStatus(
-          PermissionType::PROTECTED_MEDIA_IDENTIFIER, security_origin,
-          web_contents->GetLastCommittedURL().GetOrigin());
+          PermissionType::PROTECTED_MEDIA_IDENTIFIER,
+          url::Origin(security_origin),
+          url::Origin(web_contents->GetLastCommittedURL()));
 
   bool allowed = (permission_status == mojom::PermissionStatus::GRANTED);
   if (!task_runner_->RunsTasksOnCurrentThread()) {
     task_runner_->PostTask(FROM_HERE,
                            base::Bind(permission_status_cb, allowed));
   } else {
     permission_status_cb.Run(allowed);
   }
 }
 
@@ skipping 40 matching lines @@
   scoped_refptr<MediaKeys> cdm = GetCdm(render_frame_id, cdm_id);
   if (!cdm) {
     promise->reject(MediaKeys::INVALID_STATE_ERROR, 0, "CDM not found.");
     return;
   }
 
   cdm->LoadSession(session_type, session_id, std::move(promise));
 }
 
 }  // namespace content