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

Unified Diff: media/mojo/services/mojo_cdm.cc

Issue 1227883002: media: Pass CdmConfig in mojo CDM interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase-only Created 5 years, 5 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/mojo/services/media_type_converters_unittest.cc ('k') | media/mojo/services/mojo_cdm_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/mojo/services/mojo_cdm.cc
diff --git a/media/mojo/services/mojo_cdm.cc b/media/mojo/services/mojo_cdm.cc
index 6213053397563b619b45248f8b572387e17d203d..97b6358db9b3edc16117d0cd9528146e1e093d5a 100644
--- a/media/mojo/services/mojo_cdm.cc
+++ b/media/mojo/services/mojo_cdm.cc
@@ -87,14 +87,13 @@ MojoCdm::~MojoCdm() {
void MojoCdm::InitializeCdm(const std::string& key_system,
const GURL& security_origin,
- const media::CdmConfig& /* cdm_config */,
+ const media::CdmConfig& cdm_config,
scoped_ptr<CdmInitializedPromise> promise) {
DVLOG(1) << __FUNCTION__ << ": " << key_system;
- // TODO(xhwang): Pass |cdm_config| down.
remote_cdm_->Initialize(
- key_system, security_origin.spec(), cdm_id_,
- base::Bind(&MojoCdm::OnPromiseResult<>, weak_factory_.GetWeakPtr(),
- base::Passed(&promise)));
+ key_system, security_origin.spec(), mojo::CdmConfig::From(cdm_config),
+ cdm_id_, base::Bind(&MojoCdm::OnPromiseResult<>,
+ weak_factory_.GetWeakPtr(), base::Passed(&promise)));
}
void MojoCdm::SetServerCertificate(const std::vector<uint8_t>& certificate,
« no previous file with comments | « media/mojo/services/media_type_converters_unittest.cc ('k') | media/mojo/services/mojo_cdm_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698