media: Add MediaDrmStorage

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index bce986334fa2352fc329e3b6ba463e219fedad9a..1b7d7bb3483f0ebff3398d6a85b2fce18de89902 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -381,6 +381,9 @@
 
 #if defined(ENABLE_MOJO_MEDIA)
 #include "chrome/browser/media/output_protection_impl.h"
+#if defined(ENABLE_MOJO_CDM) && defined(OS_ANDROID)
+#include "chrome/browser/media/android/cdm/media_drm_storage_factory.h"
+#endif
 #endif
 
 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
@@ -3126,6 +3129,10 @@ void ChromeContentBrowserClient::ExposeInterfacesToMediaService(
 #if defined(ENABLE_MOJO_MEDIA)
   registry->AddInterface(
       base::Bind(&OutputProtectionImpl::Create, render_frame_host));
+#if defined(ENABLE_MOJO_CDM) && defined(OS_ANDROID)
+  registry->AddInterface(
+      base::Bind(&chrome::CreateMediaDrmStorage, render_frame_host));

[yucliu1, 2017/03/27 19:06:41]

Is it possible for media code to know the storage isn't available? If some
embedder (cast for Android) forget to add the interface, we should either guide
the developer to add the interface or disable the feature.

[xhwang, 2017/03/27 20:28:46]

This should be configured correctly during build time. Runtime detection would
be too late since we need to answer whether we support persistent license in
requestMediaKeySystemAccess() call, when we don't even have a CDM instance
created.

[xhwang, 2017/03/27 20:46:33]

Thought about this more, since not all content embedders will support this, we
can add a build time gn flag to control this. Basically only when the gn flag
and the run time flag are enabled, we will say persistent license is supported
in requestMediaKeySystemAccess().

I'll add this later. For now we are good since everything is behind the run-time
flag.

+#endif
 #endif  // defined(ENABLE_MOJO_MEDIA)
 }