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

Unified Diff: media/cdm/proxy_decryptor.cc

Issue 1131753003: Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update unittest. Created 5 years, 7 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
Index: media/cdm/proxy_decryptor.cc
diff --git a/media/cdm/proxy_decryptor.cc b/media/cdm/proxy_decryptor.cc
index d8dcd5aa557b4cf07cf91ffb571a7e61d3616572..4cbddaa715891ccdebd56325c917f8d96a683e76 100644
--- a/media/cdm/proxy_decryptor.cc
+++ b/media/cdm/proxy_decryptor.cc
@@ -12,6 +12,7 @@
#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "media/base/cdm_callback_promise.h"
+#include "media/base/cdm_config.h"
#include "media/base/cdm_factory.h"
#include "media/base/cdm_key_information.h"
#include "media/base/key_systems.h"
@@ -69,15 +70,16 @@ void ProxyDecryptor::CreateCdm(CdmFactory* cdm_factory,
// 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;
+ CdmConfig cdm_config;
+ cdm_config.allow_distinctive_identifier = true;
+ cdm_config.allow_persistent_state = true;
is_creating_cdm_ = true;
base::WeakPtr<ProxyDecryptor> weak_this = weak_ptr_factory_.GetWeakPtr();
cdm_factory->Create(
- key_system, allow_distinctive_identifier, allow_persistent_state,
- security_origin, base::Bind(&ProxyDecryptor::OnSessionMessage, weak_this),
+ key_system, security_origin, cdm_config,
+ base::Bind(&ProxyDecryptor::OnSessionMessage, weak_this),
base::Bind(&ProxyDecryptor::OnSessionClosed, weak_this),
base::Bind(&ProxyDecryptor::OnLegacySessionError, weak_this),
base::Bind(&ProxyDecryptor::OnSessionKeysChange, weak_this),
« content/browser/media/cdm/browser_cdm_manager.h ('K') | « media/cdm/default_cdm_factory.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698