MediaDrmStorage available on all Android and Chromecast build

Chromecast will use MediaDrmStorage to support persistent usage record.

Bug: internal b/142677685
Test: Build
Change-Id: Ie0ac3c962662004e0af9440046ccf3905d2c286b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2006969Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
Commit-Queue: Yuchen Liu <yucliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735706}

chrome/browser/media/android/cdm/media_drm_origin_id_manager.h

@@ -14,7 +14,7 @@
 #include "base/threading/thread_checker.h"
 #include "base/unguessable_token.h"
 #include "components/keyed_service/core/keyed_service.h"
-#include "media/base/android/media_drm_storage.h"
+#include "media/base/media_drm_storage.h"
 
 class MediaDrmOriginIdManagerFactory;
 class PrefRegistrySimple;

components/cdm/browser/BUILD.gn

@@ -6,12 +6,17 @@ import("//build/config/jumbo.gni")
 
 jumbo_source_set("browser") {
   sources = [
-    "cdm_message_filter_android.cc",
-    "cdm_message_filter_android.h",
     "media_drm_storage_impl.cc",
     "media_drm_storage_impl.h",
   ]
 
+  if (is_android) {
+    sources += [
+      "cdm_message_filter_android.cc",
+      "cdm_message_filter_android.h",
+    ]
+  }
+
   public_deps = [
     "//base",
     "//content/public/browser",

components/cdm/browser/media_drm_storage_impl.cc

@@ -18,7 +18,7 @@
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "content/public/browser/navigation_handle.h"
-#include "media/base/android/media_drm_key_type.h"
+#include "media/base/media_drm_key_type.h"
 #include "url/origin.h"
 #include "url/url_constants.h"
 

media/BUILD.gn

@@ -34,6 +34,7 @@ buildflag_header("media_buildflags") {
     "ENABLE_LIBRARY_CDMS=$enable_library_cdms",
     "ENABLE_LIBVPX=$media_use_libvpx",
     "ENABLE_LOGGING_OVERRIDE=$enable_logging_override",
+    "ENABLE_MEDIA_DRM_STORAGE=$enable_media_drm_storage",
     "ENABLE_MEDIA_REMOTING=$enable_media_remoting",
     "ENABLE_MEDIA_REMOTING_RPC=$enable_media_remoting_rpc",
     "ENABLE_PLATFORM_MPEG_H_AUDIO=$enable_platform_mpeg_h_audio",

media/base/BUILD.gn

@@ -418,6 +418,14 @@ jumbo_source_set("base") {
   } else {
     sources += [ "demuxer_memory_limit_default.cc" ]
   }
+
+  if (enable_media_drm_storage) {
+    sources += [
+      "media_drm_key_type.h",
+      "media_drm_storage.cc",
+      "media_drm_storage.h",
+    ]
+  }
 }
 
 source_set("video_facing") {

media/base/android/BUILD.gn

@@ -47,9 +47,6 @@ if (is_android) {
       "media_drm_bridge_delegate.h",
       "media_drm_bridge_factory.cc",
       "media_drm_bridge_factory.h",
-      "media_drm_key_type.h",
-      "media_drm_storage.cc",
-      "media_drm_storage.h",
       "media_drm_storage_bridge.cc",
       "media_drm_storage_bridge.h",
       "media_player_bridge.cc",

media/base/android/media_drm_bridge.cc

@@ -30,9 +30,9 @@
 #include "media/base/android/media_codec_util.h"
 #include "media/base/android/media_drm_bridge_client.h"
 #include "media/base/android/media_drm_bridge_delegate.h"
-#include "media/base/android/media_drm_key_type.h"
 #include "media/base/android/media_jni_headers/MediaDrmBridge_jni.h"
 #include "media/base/cdm_key_information.h"
+#include "media/base/media_drm_key_type.h"
 #include "media/base/media_switches.h"
 #include "media/base/provision_fetcher.h"
 #include "third_party/widevine/cdm/widevine_cdm_common.h"

media/base/android/media_drm_bridge.h

@@ -21,12 +21,12 @@
 #include "media/base/android/android_util.h"
 #include "media/base/android/media_crypto_context.h"
 #include "media/base/android/media_crypto_context_impl.h"
-#include "media/base/android/media_drm_storage.h"
 #include "media/base/android/media_drm_storage_bridge.h"
 #include "media/base/cdm_context.h"
 #include "media/base/cdm_promise.h"
 #include "media/base/cdm_promise_adapter.h"
 #include "media/base/content_decryption_module.h"
+#include "media/base/media_drm_storage.h"
 #include "media/base/media_export.h"
 #include "media/base/player_tracker.h"
 #include "media/base/provision_fetcher.h"

media/base/android/media_drm_storage_bridge.cc

@@ -18,8 +18,8 @@
 #include "base/unguessable_token.h"
 #include "media/base/android/android_util.h"
 #include "media/base/android/media_drm_bridge.h"
-#include "media/base/android/media_drm_key_type.h"
 #include "media/base/android/media_jni_headers/MediaDrmStorageBridge_jni.h"
+#include "media/base/media_drm_key_type.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF8ToJavaString;

media/base/android/media_drm_storage_bridge.h

@@ -14,7 +14,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "media/base/android/android_util.h"
-#include "media/base/android/media_drm_storage.h"
+#include "media/base/media_drm_storage.h"
 #include "url/origin.h"
 
 namespace base {

media/base/ipc/media_param_traits_macros.h

@@ -43,9 +43,9 @@
 #include "media/video/supported_video_decoder_config.h"
 #include "ui/gfx/ipc/color/gfx_param_traits_macros.h"
 
-#if defined(OS_ANDROID)
-#include "media/base/android/media_drm_key_type.h"
-#endif  // defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_MEDIA_DRM_STORAGE)
+#include "media/base/media_drm_key_type.h"
+#endif  // BUILDFLAG(ENABLE_MEDIA_DRM_STORAGE)
 
 // Enum traits.
 
@@ -147,11 +147,11 @@ IPC_ENUM_TRAITS_MAX_VALUE(media::VideoRotation, media::VIDEO_ROTATION_MAX)
 IPC_ENUM_TRAITS_MAX_VALUE(media::container_names::MediaContainerName,
                           media::container_names::CONTAINER_MAX)
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_MEDIA_DRM_STORAGE)
 IPC_ENUM_TRAITS_MIN_MAX_VALUE(media::MediaDrmKeyType,
                               media::MediaDrmKeyType::MIN,
                               media::MediaDrmKeyType::MAX)
-#endif  // defined(OS_ANDROID)
+#endif  // BUILDFLAG(ENABLE_MEDIA_DRM_STORAGE)
 
 IPC_ENUM_TRAITS_VALIDATE(
     media::VideoColorSpace::PrimaryID,

media/base/android/media_drm_key_type.h → media/base/media_drm_key_type.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_BASE_ANDROID_MEDIA_DRM_KEY_TYPE_H_
-#define MEDIA_BASE_ANDROID_MEDIA_DRM_KEY_TYPE_H_
+#ifndef MEDIA_BASE_MEDIA_DRM_KEY_TYPE_H_
+#define MEDIA_BASE_MEDIA_DRM_KEY_TYPE_H_
 
 #include <stdint.h>
 
@@ -22,4 +22,4 @@ enum class MediaDrmKeyType : uint32_t {
 };
 
 }  // namespace media
-#endif  // MEDIA_BASE_ANDROID_MEDIA_DRM_KEY_TYPE_H_
+#endif  // MEDIA_BASE_MEDIA_DRM_KEY_TYPE_H_

media/base/android/media_drm_storage.cc → media/base/media_drm_storage.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "media/base/android/media_drm_storage.h"
+#include "media/base/media_drm_storage.h"
 
 #include <utility>
 

media/base/android/media_drm_storage.h → media/base/media_drm_storage.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MEDIA_BASE_ANDROID_MEDIA_DRM_STORAGE_H_
-#define MEDIA_BASE_ANDROID_MEDIA_DRM_STORAGE_H_
+#ifndef MEDIA_BASE_MEDIA_DRM_STORAGE_H_
+#define MEDIA_BASE_MEDIA_DRM_STORAGE_H_
 
 #include <stdint.h>
 
@@ -15,7 +15,7 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/optional.h"
-#include "media/base/android/media_drm_key_type.h"
+#include "media/base/media_drm_key_type.h"
 #include "media/base/media_export.h"
 #include "url/origin.h"
 
@@ -34,7 +34,7 @@ class MEDIA_EXPORT MediaDrmStorage
   // If not specified, the device specific origin ID is to be used.
   using MediaDrmOriginId = base::Optional<base::UnguessableToken>;
 
-  struct SessionData {
+  struct MEDIA_EXPORT SessionData {
     SessionData(std::vector<uint8_t> key_set_id,
                 std::string mime_type,
                 MediaDrmKeyType key_type);
@@ -103,4 +103,4 @@ using CreateStorageCB = base::Callback<std::unique_ptr<MediaDrmStorage>()>;
 
 }  // namespace media
 
-#endif  // MEDIA_BASE_ANDROID_MEDIA_DRM_STORAGE_H_
+#endif  // MEDIA_BASE_MEDIA_DRM_STORAGE_H_

media/media_options.gni

@@ -91,6 +91,10 @@ declare_args() {
   enable_logging_override = !use_jumbo_build && (is_chromecast || is_fuchsia)
 
   enable_dav1d_decoder = !is_android && !is_ios
+
+  # Enable browser managed persistent metadata storage for EME persistent
+  # session and persistent usage record session.
+  enable_media_drm_storage = is_android || is_chromecast
 }
 
 declare_args() {

media/mojo/mojom/BUILD.gn

@@ -42,11 +42,12 @@ mojom("mojom") {
     "watch_time_recorder.mojom",
   ]
 
+  if (enable_media_drm_storage) {
+    sources += [ "media_drm_storage.mojom" ]
+  }
+
   if (is_android) {
-    sources += [
-      "android_overlay.mojom",
-      "media_drm_storage.mojom",
-    ]
+    sources += [ "android_overlay.mojom" ]
   }
 
   if (is_chromecast) {

media/mojo/mojom/media_drm_storage.typemap

@@ -4,14 +4,10 @@
 
 mojom = "//media/mojo/mojom/media_drm_storage.mojom"
 
-os_whitelist = [ "android" ]
-
-public_headers = [ "//media/base/android/media_drm_key_type.h" ]
+public_headers = [ "//media/base/media_drm_key_type.h" ]
 
 traits_headers = [ "//media/base/ipc/media_param_traits_macros.h" ]
 
-deps = [
-  "//media",
-]
+deps = [ "//media" ]
 
 type_mappings = [ "media.mojom.SessionData.KeyType=::media::MediaDrmKeyType" ]

media/mojo/mojom/typemaps.gni

@@ -13,7 +13,6 @@ typemaps = [
   "//media/mojo/mojom/demuxer_stream.typemap",
   "//media/mojo/mojom/encryption_pattern.typemap",
   "//media/mojo/mojom/hdr_metadata.typemap",
-  "//media/mojo/mojom/media_drm_storage.typemap",
   "//media/mojo/mojom/media_types.typemap",
   "//media/mojo/mojom/pipeline_status.typemap",
   "//media/mojo/mojom/video_color_space.typemap",
@@ -24,6 +23,10 @@ typemaps = [
   "//media/mojo/mojom/video_frame.typemap",
 ]
 
+if (enable_media_drm_storage) {
+  typemaps += [ "//media/mojo/mojom/media_drm_storage.typemap" ]
+}
+
 if (enable_cdm_proxy) {
   typemaps += [ "//media/mojo/mojom/cdm_proxy.typemap" ]
 }

media/mojo/services/BUILD.gn

@@ -108,6 +108,11 @@ jumbo_component("services") {
       "android_mojo_media_client.h",
       "android_mojo_util.cc",
       "android_mojo_util.h",
+    ]
+  }
+
+  if (enable_media_drm_storage) {
+    sources += [
       "mojo_media_drm_storage.cc",
       "mojo_media_drm_storage.h",
     ]

media/mojo/services/mojo_media_drm_storage.h

@@ -10,7 +10,7 @@
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "media/base/android/media_drm_storage.h"
+#include "media/base/media_drm_storage.h"
 #include "media/mojo/mojom/media_drm_storage.mojom.h"
 #include "media/mojo/services/media_mojo_export.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"