media: Add MediaDrmStorage

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 2012 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 "chrome/browser/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 363 matching lines @@
 #if BUILDFLAG(ENABLE_MEDIA_REMOTING) && defined(ENABLE_MEDIA_ROUTER)
 #include "chrome/browser/media/cast_remoting_connector.h"
 #endif
 
 #if BUILDFLAG(ENABLE_WAYLAND_SERVER)
 #include "chrome/browser/chrome_browser_main_extra_parts_exo.h"
 #endif
 
 #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)
 #include "media/mojo/services/media_service_factory.h"  // nogncheck
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/metrics/leak_detector/leak_detector_remote_controller.h"
 #endif
 
@@ skipping 2725 matching lines @@
 // TODO(xhwang): Only register this when ENABLE_MOJO_MEDIA.
 #if defined(OS_CHROMEOS)
   registry->AddInterface(
       base::Bind(&chromeos::attestation::PlatformVerificationImpl::Create,
                  render_frame_host));
 #endif  // defined(OS_CHROMEOS)
 
 #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)
 }
 
 void ChromeContentBrowserClient::RegisterRenderFrameMojoInterfaces(
     service_manager::InterfaceRegistry* registry,
     content::RenderFrameHost* render_frame_host) {
   if (base::FeatureList::IsEnabled(features::kWebUsb)
 #if BUILDFLAG(ENABLE_EXTENSIONS)
       &&
       !render_frame_host->GetSiteInstance()->GetSiteURL().SchemeIs(
@@ skipping 424 matching lines @@
     RedirectNonUINonIOBrowserThreadsToTaskScheduler() {
   return variations::GetVariationParamValue(
              "BrowserScheduler", "RedirectNonUINonIOBrowserThreads") == "true";
 }
 
 // static
 void ChromeContentBrowserClient::SetDefaultQuotaSettingsForTesting(
     const storage::QuotaSettings* settings) {
   g_default_quota_settings = settings;
 }