Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2071)

Unified Diff: media/cdm/proxy_decryptor.cc

Issue 985113003: Block platform verification and file IO in the CDM adapter if the CDM configuration disallows them. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix DCHECK types. Created 5 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cdm/ppapi/cdm_adapter.cc ('k') | ppapi/api/private/ppp_content_decryptor_private.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cdm/proxy_decryptor.cc
diff --git a/media/cdm/proxy_decryptor.cc b/media/cdm/proxy_decryptor.cc
index d1be9d8b204fe2b99d4dbf3a368cc733ea8af852..ac96979efca00a9cac416fcc33552e83278e68e6 100644
--- a/media/cdm/proxy_decryptor.cc
+++ b/media/cdm/proxy_decryptor.cc
@@ -195,9 +195,16 @@ scoped_ptr<MediaKeys> ProxyDecryptor::CreateMediaKeys(
CdmFactory* cdm_factory,
const std::string& key_system,
const GURL& security_origin) {
+ // TODO(sandersd): Trigger permissions check here and use it to determine
+ // distinctive identifier support, instead of always requiring the
+ // permission. http://crbug.com/455271
+ bool allow_distinctive_identifier = true;
+ bool allow_persistent_state = true;
base::WeakPtr<ProxyDecryptor> weak_this = weak_ptr_factory_.GetWeakPtr();
return cdm_factory->Create(
key_system,
+ allow_distinctive_identifier,
+ allow_persistent_state,
security_origin,
base::Bind(&ProxyDecryptor::OnSessionMessage, weak_this),
base::Bind(&ProxyDecryptor::OnSessionClosed, weak_this),
« no previous file with comments | « media/cdm/ppapi/cdm_adapter.cc ('k') | ppapi/api/private/ppp_content_decryptor_private.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698