content/browser/media/cdm/browser_cdm_manager.cc - Issue 1726323002: Have Permission{Manager,Service} use Origin.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/media/cdm/browser_cdm_manager.cc

Issue 1726323002: Have Permission{Manager,Service} use Origin. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: content/browser/media/cdm/browser_cdm_manager.cc

diff --git a/content/browser/media/cdm/browser_cdm_manager.cc b/content/browser/media/cdm/browser_cdm_manager.cc

index 1983967311a4ede086734cd57222f3feffc4dc82..a4a6ff7ef2dd8a63b73150a370340cd3f717c042 100644

--- a/content/browser/media/cdm/browser_cdm_manager.cc

+++ b/content/browser/media/cdm/browser_cdm_manager.cc

@@ -673,8 +673,9 @@ void BrowserCdmManager::CheckPermissionStatusOnUIThread(

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()) {