Commit b3de0b4d authored by Stephen Lanham's avatar Stephen Lanham Committed by Commit Bot

[Chromecast] Enable PROTECTED_MEDIA_IDENTIFIER permission on Cast builds

This permission is needed on Cast devices, including Linux-based builds,
but it was removed here: crrev.com/c/1045962. Restore it on Cast builds.

BUG=b/79526220
Bug: 79526220
Test: CQ

Change-Id: I0678a29e97eb003878db458dface608b6550d2fc
Reviewed-on: https://chromium-review.googlesource.com/1054334Reviewed-by: default avatarSergey Volk <servolk@chromium.org>
Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Stephen Lanham <slan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#557671}
parent 14f71622
...@@ -1783,6 +1783,10 @@ jumbo_source_set("browser") { ...@@ -1783,6 +1783,10 @@ jumbo_source_set("browser") {
] ]
} }
if (is_chromeos || is_android || is_chromecast) {
defines += [ "ENABLE_PROTECTED_MEDIA_IDENTIFIER_PERMISSION" ]
}
if (is_chromecast && is_linux) { if (is_chromecast && is_linux) {
sources += [ sources += [
"tracing/cast_tracing_agent.cc", "tracing/cast_tracing_agent.cc",
......
...@@ -47,13 +47,13 @@ bool PermissionDescriptorToPermissionType( ...@@ -47,13 +47,13 @@ bool PermissionDescriptorToPermissionType(
return true; return true;
} }
case PermissionName::PROTECTED_MEDIA_IDENTIFIER: case PermissionName::PROTECTED_MEDIA_IDENTIFIER:
#if defined(OS_ANDROID) || defined(OS_CHROMEOS) #if defined(ENABLE_PROTECTED_MEDIA_IDENTIFIER_PERMISSION)
*permission_type = PermissionType::PROTECTED_MEDIA_IDENTIFIER; *permission_type = PermissionType::PROTECTED_MEDIA_IDENTIFIER;
return true; return true;
#else #else
NOTIMPLEMENTED(); NOTIMPLEMENTED();
return false; return false;
#endif #endif // defined(ENABLE_PROTECTED_MEDIA_IDENTIFIER_PERMISSION)
case PermissionName::DURABLE_STORAGE: case PermissionName::DURABLE_STORAGE:
*permission_type = PermissionType::DURABLE_STORAGE; *permission_type = PermissionType::DURABLE_STORAGE;
return true; return true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment