Move MediaDrmBridge provision communication to native side.

media/base/android/android_cdm_factory.cc

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..34302f6c61f0fc932a1f9019ca8498eb792a580d 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"
@@ -45,8 +46,11 @@ void AndroidCdmFactory::Create(
     return;
   }
 
+  DCHECK(provision_fetcher_);
+
   scoped_refptr<MediaDrmBridge> cdm(
-      MediaDrmBridge::Create(key_system, session_message_cb, session_closed_cb,
+      MediaDrmBridge::Create(key_system, provision_fetcher_.Pass(),

[xhwang, 2015/11/11 09:53:21]

We could use the same AndroidCdmFactory to create multiple CDMs, so this won't
work :(

To fix this, we should probably pass in a callback that creates
scoped_ptr<ProvisionFetcher>. What do you think?

[Tima Vaisburd, 2015/11/11 23:26:35]

Made another class - ProvisionFetcherFactory - and passed its subclass to
AndroidCdmFactory constructor. AndroidCdmFactory owns ProvisonFetcherFactory.
ProvisionFetcherFactory's sublass (URL...) holds the networking context and can
create fetchers.

MediaDrmCredentialManager also owns such factory for the browser system context.

With this change MediaDrmBridge methods can accept the factory pointer instead
of a fetcher pointer. This is not done yet. WDYT?

[xhwang, 2015/11/12 22:27:03]

I don't think MDB would allow >1 provisioning process at the same time. So it
seems unnecessary, WDYT?

[Tima Vaisburd, 2015/11/13 03:13:10]

Yes, I removed ProvisionFetcherFactory altogether.

+                             session_message_cb, session_closed_cb,
                              legacy_session_error_cb, session_keys_change_cb,
                              session_expiration_update_cb));
   if (!cdm) {
@@ -82,4 +86,10 @@ void AndroidCdmFactory::Create(
   bound_cdm_created_cb.Run(cdm, "");
 }
 
+void AndroidCdmFactory::SetProvisionFetcher(
+    scoped_ptr<ProvisionFetcher> provision_fetcher) {
+  DCHECK(!provision_fetcher_);
+  provision_fetcher_ = provision_fetcher.Pass();
+}
+
 }  // namespace media