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

Unified Diff: media/base/browser_cdm_factory.cc

Issue 1427183002: Move MediaDrmBridge provision communication to native side. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: For on-demand provisioning the fetcher is created in content/ and depends on the renderer. Created 5 years, 1 month 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/base/browser_cdm_factory.cc
diff --git a/media/base/browser_cdm_factory.cc b/media/base/browser_cdm_factory.cc
index 73fd4c72e22589c66746de90f7b34665019b163d..f826b3418172f4f4cea115accdfbf9c39cacae92 100644
--- a/media/base/browser_cdm_factory.cc
+++ b/media/base/browser_cdm_factory.cc
@@ -24,6 +24,7 @@ void SetBrowserCdmFactory(BrowserCdmFactory* factory) {
ScopedBrowserCdmPtr CreateBrowserCdm(
const std::string& key_system,
bool use_hw_secure_codecs,
+ scoped_ptr<ProvisionFetcher> provision_fetcher,
const SessionMessageCB& session_message_cb,
const SessionClosedCB& session_closed_cb,
const LegacySessionErrorCB& legacy_session_error_cb,
@@ -31,7 +32,7 @@ ScopedBrowserCdmPtr CreateBrowserCdm(
const SessionExpirationUpdateCB& session_expiration_update_cb) {
if (!g_cdm_factory) {
#if defined(OS_ANDROID)
- SetBrowserCdmFactory(new BrowserCdmFactoryAndroid);
+ SetBrowserCdmFactory(new BrowserCdmFactoryAndroid());
#else
LOG(ERROR) << "Cannot create BrowserCdm: no BrowserCdmFactory available!";
return ScopedBrowserCdmPtr();
@@ -39,9 +40,9 @@ ScopedBrowserCdmPtr CreateBrowserCdm(
}
return g_cdm_factory->CreateBrowserCdm(
- key_system, use_hw_secure_codecs, session_message_cb, session_closed_cb,
- legacy_session_error_cb, session_keys_change_cb,
- session_expiration_update_cb);
+ key_system, use_hw_secure_codecs, provision_fetcher.Pass(),
+ session_message_cb, session_closed_cb, legacy_session_error_cb,
+ session_keys_change_cb, session_expiration_update_cb);
}
} // namespace media

Powered by Google App Engine
This is Rietveld 408576698