Move MediaDrmBridge provision communication to native side.

content/browser/media/cdm/browser_cdm_manager.cc

 // Copyright 2014 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 "content/browser/media/cdm/browser_cdm_manager.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/task_runner.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/permission_manager.h"
 #include "content/public/browser/permission_type.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_process_host_observer.h"
 #include "content/public/browser/web_contents.h"
 #include "media/base/browser_cdm.h"
 #include "media/base/browser_cdm_factory.h"
 #include "media/base/cdm_promise.h"
 #include "media/base/limits.h"
 
 #if defined(OS_ANDROID)
+#include "content/public/browser/android/cdm_provision_fetcher.h"
 #include "content/public/common/renderer_preferences.h"
 #endif
 
 namespace content {
 
 using media::BrowserCdm;
 using media::MediaKeys;
 using media::ScopedBrowserCdmPtr;
 
 namespace {
@@ skipping 494 matching lines @@
 
 void BrowserCdmManager::AddCdm(int render_frame_id,
                                int cdm_id,
                                uint32_t promise_id,
                                const std::string& key_system,
                                const GURL& security_origin,
                                bool use_hw_secure_codecs) {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
   DCHECK(!GetCdm(render_frame_id, cdm_id));
 
+  scoped_ptr<media::ProvisionFetcher> provision_fetcher;
+
+#if defined(OS_ANDROID)
+  net::URLRequestContextGetter* context =
+      RenderProcessHost::FromID(render_process_id_)
+          ->GetBrowserContext()
+          ->GetRequestContext();
+  DCHECK(context);
+  provision_fetcher = CDMProvisionFetcher::CreateWithURLContext(context);

[xhwang, 2015/11/06 23:08:18]

Can you just create a URLProvisionFetch directly here, without going through
CDMProvisionFetcher?

[Tima Vaisburd, 2015/11/11 03:03:34]

Done.

+#endif
+
   scoped_ptr<SimplePromise> promise(new SimplePromise(
       weak_ptr_factory_.GetWeakPtr(), render_frame_id, cdm_id, promise_id));
 
   ScopedBrowserCdmPtr cdm(media::CreateBrowserCdm(
-      key_system, use_hw_secure_codecs,
+      key_system, use_hw_secure_codecs, provision_fetcher.Pass(),

[Tima Vaisburd, 2015/11/05 02:24:07]

I pass |provision_fetcher| here as a parameter, and so I had to move the
ProvisionFetcher definition to media/base/, although it is used only for
Android. I wonder whether there is a better way.

[Tima Vaisburd, 2015/11/05 02:28:54]

An alternative could be adding another factory method in MediaClientAndroid,
e.g. CreateFetcherForRenderProcess(int id) and implementing it in every subclass
of MediaClientAndroid. WDYT?

[xhwang, 2015/11/06 23:08:19]

See comments above.

ProvisionFetcher is only used by MDB, we probably still want to keep it in
media/base/android. See my comment above, we don't want this parameter in
Create() call, which is used for all CDM creations.

[Tima Vaisburd, 2015/11/11 03:03:34]

Done.

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

MediaClients are consumed by media/, which has no knowledge of what a render
process is.

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

MediaClient is not used for the provisioning purpose any more, I think my
question was outdated. Or did I miss your point here?

       BROWSER_CDM_MANAGER_CB(OnSessionMessage),
       BROWSER_CDM_MANAGER_CB(OnSessionClosed),
       BROWSER_CDM_MANAGER_CB(OnLegacySessionError),
       BROWSER_CDM_MANAGER_CB(OnSessionKeysChange),
       BROWSER_CDM_MANAGER_CB(OnSessionExpirationUpdate)));
 
   if (!cdm) {
     DVLOG(1) << "failed to create CDM.";
     promise->reject(MediaKeys::INVALID_STATE_ERROR, 0, "Failed to create CDM.");
     return;
@@ skipping 124 matching lines @@
   BrowserCdm* cdm = GetCdm(render_frame_id, cdm_id);
   if (!cdm) {
     promise->reject(MediaKeys::INVALID_STATE_ERROR, 0, "CDM not found.");
     return;
   }
 
   cdm->LoadSession(session_type, session_id, promise.Pass());
 }
 
 }  // namespace content