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

Unified Diff: content/renderer/media/crypto/proxy_media_keys.cc

Issue 1132773003: Revert of Plumb |use_secure_codecs| through to BrowserCdmFactoryAndroid. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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: content/renderer/media/crypto/proxy_media_keys.cc
diff --git a/content/renderer/media/crypto/proxy_media_keys.cc b/content/renderer/media/crypto/proxy_media_keys.cc
index 4092324d6611c45f97152ed0a35a8aa2d98de97b..79357c293d91e74351cf2c2bb0601dc14d9eb763 100644
--- a/content/renderer/media/crypto/proxy_media_keys.cc
+++ b/content/renderer/media/crypto/proxy_media_keys.cc
@@ -20,7 +20,6 @@
void ProxyMediaKeys::Create(
const std::string& key_system,
const GURL& security_origin,
- bool use_hw_secure_codecs,
RendererCdmManager* manager,
const media::SessionMessageCB& session_message_cb,
const media::SessionClosedCB& session_closed_cb,
@@ -39,7 +38,7 @@
scoped_ptr<CdmInitializedPromise> promise(
new CdmInitializedPromise(cdm_created_cb, proxy_media_keys.Pass()));
proxy_media_keys_copy->InitializeCdm(key_system, security_origin,
- use_hw_secure_codecs, promise.Pass());
+ promise.Pass());
}
ProxyMediaKeys::~ProxyMediaKeys() {
@@ -205,11 +204,10 @@
void ProxyMediaKeys::InitializeCdm(
const std::string& key_system,
const GURL& security_origin,
- bool use_hw_secure_codecs,
scoped_ptr<media::SimpleCdmPromise> promise) {
uint32_t promise_id = cdm_promise_adapter_.SavePromise(promise.Pass());
manager_->InitializeCdm(cdm_id_, promise_id, this, key_system,
- security_origin, use_hw_secure_codecs);
+ security_origin);
}
} // namespace content
« no previous file with comments | « content/renderer/media/crypto/proxy_media_keys.h ('k') | content/renderer/media/crypto/render_cdm_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698