Move MediaDrmBridge provision communication to native side.

media/base/android/android_cdm_factory.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/base/android/android_cdm_factory.h"
 
 #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"
 #include "third_party/widevine/cdm/widevine_cdm_common.h"
 #include "url/gurl.h"
 
 namespace media {
 
 AndroidCdmFactory::AndroidCdmFactory() {}
 
@@ skipping 19 matching lines @@
 
   std::string error_message;
 
   if (!MediaDrmBridge::IsKeySystemSupported(key_system)) {
     error_message = "Key system not supported unexpectedly: " + key_system;
     NOTREACHED() << error_message;
     bound_cdm_created_cb.Run(nullptr, error_message);
     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) {
     error_message = "MediaDrmBridge cannot be created for " + key_system;
     NOTREACHED() << error_message;
     bound_cdm_created_cb.Run(nullptr, error_message);
     return;
   }
 
   if (key_system == kWidevineKeySystem) {
@@ skipping 15 matching lines @@
         " may require use_video_overlay_for_embedded_encrypted_video";
     NOTREACHED() << error_message;
     bound_cdm_created_cb.Run(nullptr, error_message);
     return;
   }
 
   // Success!
   bound_cdm_created_cb.Run(cdm, "");
 }
 
+void AndroidCdmFactory::SetProvisionFetcher(
+    scoped_ptr<ProvisionFetcher> provision_fetcher) {
+  DCHECK(!provision_fetcher_);
+  provision_fetcher_ = provision_fetcher.Pass();
+}
+
 }  // namespace media