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

Unified Diff: media/base/android/android_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: Reformatted media/ 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/android/android_cdm_factory.cc
diff --git a/media/base/android/android_cdm_factory.cc b/media/base/android/android_cdm_factory.cc
index 45bfad543c7675480e3655a351c739178ea2a4c3..c81f82de8a7a7837854f7231ebee1c5c47ee77e1 100644
--- a/media/base/android/android_cdm_factory.cc
+++ b/media/base/android/android_cdm_factory.cc
@@ -6,6 +6,7 @@
#include "base/strings/string_number_conversions.h"
#include "media/base/android/media_drm_bridge.h"
+#include "media/base/android/provision_fetcher.h"
#include "media/base/bind_to_current_loop.h"
#include "media/base/cdm_config.h"
#include "media/base/key_systems.h"
@@ -14,7 +15,8 @@
namespace media {
-AndroidCdmFactory::AndroidCdmFactory() {}
+AndroidCdmFactory::AndroidCdmFactory(const CreateFetcherCB& create_fetcher_cb)
+ : create_fetcher_cb_(create_fetcher_cb) {}
AndroidCdmFactory::~AndroidCdmFactory() {}
@@ -45,10 +47,10 @@ void AndroidCdmFactory::Create(
return;
}
- scoped_refptr<MediaDrmBridge> cdm(
- MediaDrmBridge::Create(key_system, session_message_cb, session_closed_cb,
- legacy_session_error_cb, session_keys_change_cb,
- session_expiration_update_cb));
+ scoped_refptr<MediaDrmBridge> cdm(MediaDrmBridge::Create(
+ key_system, create_fetcher_cb_.Run(), session_message_cb,
+ session_closed_cb, legacy_session_error_cb, session_keys_change_cb,
+ session_expiration_update_cb));
if (!cdm) {
error_message = "MediaDrmBridge cannot be created for " + key_system;
NOTREACHED() << error_message;
« no previous file with comments | « media/base/android/android_cdm_factory.h ('k') | media/base/android/java/src/org/chromium/media/MediaDrmBridge.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698