Move remaining media typemaps to GN

Bug: 1059389
Change-Id: Ie88ba35be8ee0d8c78cf685a270a3cedee0c872e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2314023
Commit-Queue: Ken Rockot <rockot@google.com>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#791023}

media/mojo/mojom/BUILD.gn

@@ -81,6 +81,19 @@ mojom("mojom") {
   }
 
   shared_typemaps = [
+    {
+      types = [
+        {
+          mojom = "media.mojom.AudioParameters"
+          cpp = "::media::AudioParameters"
+        },
+      ]
+      traits_headers = [ "//media/base/ipc/media_param_traits.h" ]
+      traits_public_deps = [
+        "//media",
+        "//media/base/ipc",
+      ]
+    },
     {
       types = [
         {
@@ -94,6 +107,37 @@ mojom("mojom") {
   ]
 
   cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "media.mojom.AudioDecoderConfig"
+          cpp = "::media::AudioDecoderConfig"
+        },
+      ]
+      traits_headers = [ "audio_decoder_config_mojom_traits.h" ]
+      traits_sources = [ "audio_decoder_config_mojom_traits.cc" ]
+      traits_public_deps = [
+        "//base",
+        "//media",
+        "//media/base/ipc",
+      ]
+    },
+    {
+      types = [
+        {
+          mojom = "media.mojom.CdmKeyInformation"
+          cpp = "::std::unique_ptr<::media::CdmKeyInformation>"
+          move_only = true
+        },
+        {
+          mojom = "media.mojom.CdmKeyStatus"
+          cpp = "::media::CdmKeyInformation::KeyStatus"
+        },
+      ]
+      traits_headers = [ "cdm_key_information_mojom_traits.h" ]
+      traits_sources = [ "cdm_key_information_mojom_traits.cc" ]
+      traits_public_deps = [ "//media" ]
+    },
     {
       types = [
         {
@@ -103,6 +147,87 @@ mojom("mojom") {
       ]
       traits_headers = [ "media_types_enum_mojom_traits.h" ]
     },
+    {
+      types = [
+        {
+          mojom = "media.mojom.CdmConfig"
+          cpp = "::media::CdmConfig"
+        },
+        {
+          mojom = "media.mojom.CdmPromiseResult.Exception"
+          cpp = "::media::CdmPromise::Exception"
+        },
+        {
+          mojom = "media.mojom.CdmSessionType"
+          cpp = "::media::CdmSessionType"
+        },
+        {
+          mojom = "media.mojom.CdmMessageType"
+          cpp = "::media::CdmMessageType"
+        },
+        {
+          mojom = "media.mojom.Decryptor.Status"
+          cpp = "::media::Decryptor::Status"
+        },
+        {
+          mojom = "media.mojom.Decryptor.StreamType"
+          cpp = "::media::Decryptor::StreamType"
+        },
+        {
+          mojom = "media.mojom.DemuxerStream.Status"
+          cpp = "::media::DemuxerStream::Status"
+        },
+        {
+          mojom = "media.mojom.DemuxerStream.Type"
+          cpp = "::media::DemuxerStream::Type"
+        },
+        {
+          mojom = "media.mojom.EmeInitDataType"
+          cpp = "::media::EmeInitDataType"
+        },
+        {
+          mojom = "media.mojom.HdcpVersion"
+          cpp = "::media::HdcpVersion"
+        },
+        {
+          mojom = "media.mojom.SessionData.KeyType"
+          cpp = "::media::MediaDrmKeyType"
+        },
+      ]
+      traits_headers = [ "//media/base/ipc/media_param_traits_macros.h" ]
+      traits_public_deps = [
+        "//media",
+        "//media/base/ipc",
+      ]
+    },
+    {
+      types = [
+        {
+          mojom = "media.mojom.EncryptionPattern"
+          cpp = "::media::EncryptionPattern"
+        },
+      ]
+      traits_headers = [ "encryption_pattern_mojom_traits.h" ]
+      traits_sources = [ "encryption_pattern_mojom_traits.cc" ]
+      traits_public_deps = [
+        "//media",
+        "//media/base/ipc",
+      ]
+    },
+    {
+      types = [
+        {
+          mojom = "media.mojom.MasteringMetadata"
+          cpp = "::media::MasteringMetadata"
+        },
+        {
+          mojom = "media.mojom.HDRMetadata"
+          cpp = "::media::HDRMetadata"
+        },
+      ]
+      traits_headers = [ "hdr_metadata_mojom_traits.h" ]
+      traits_public_deps = [ "//media" ]
+    },
     {
       types = [
         {
@@ -151,6 +276,119 @@ mojom("mojom") {
       ]
       traits_headers = [ "video_color_space_mojom_traits.h" ]
     },
+    {
+      types = [
+        {
+          mojom = "media.mojom.OverlayInfo"
+          cpp = "::media::OverlayInfo"
+        },
+        {
+          mojom = "media.mojom.SupportedVideoDecoderConfig"
+          cpp = "::media::SupportedVideoDecoderConfig"
+        },
+        {
+          mojom = "media.mojom.VideoDecoderImplementation"
+          cpp = "::media::VideoDecoderImplementation"
+        },
+      ]
+      traits_headers = [
+        "supported_video_decoder_config_mojom_traits.h",
+        "//media/base/ipc/media_param_traits_macros.h",
+      ]
+      traits_sources = [ "supported_video_decoder_config_mojom_traits.cc" ]
+      traits_public_deps = [
+        "//base",
+        "//media",
+        "//media/base/ipc",
+        "//media/gpu/ipc/common",
+        "//ui/gfx/geometry/mojom:mojom_traits",
+      ]
+    },
+    {
+      types = [
+        {
+          mojom = "media.mojom.VideoDecoderConfig"
+          cpp = "::media::VideoDecoderConfig"
+        },
+      ]
+      traits_headers = [ "//media/base/video_decoder_config.h" ]
+      traits_private_headers = [ "video_decoder_config_mojom_traits.h" ]
+      traits_sources = [ "video_decoder_config_mojom_traits.cc" ]
+      traits_public_deps = [
+        "//base",
+        "//media",
+        "//media/base/ipc",
+        "//ui/gfx/geometry/mojom:mojom_traits",
+      ]
+    },
+    {
+      types = [
+        {
+          mojom = "media.mojom.BitstreamBufferMetadata"
+          cpp = "::media::BitstreamBufferMetadata"
+        },
+        {
+          mojom = "media.mojom.VideoBitrateAllocation"
+          cpp = "::media::VideoBitrateAllocation"
+        },
+        {
+          mojom = "media.mojom.VideoEncodeAccelerator.Error"
+          cpp = "::media::VideoEncodeAccelerator::Error"
+        },
+        {
+          mojom = "media.mojom.VideoEncodeAcceleratorConfig"
+          cpp = "::media::VideoEncodeAccelerator::Config"
+        },
+        {
+          mojom = "media.mojom.SpatialLayer"
+          cpp = "::media::VideoEncodeAccelerator::Config::SpatialLayer"
+        },
+        {
+          mojom = "media.mojom.VideoEncodeAcceleratorSupportedProfile"
+          cpp = "::media::VideoEncodeAccelerator::SupportedProfile"
+        },
+        {
+          mojom = "media.mojom.Vp8Metadata"
+          cpp = "::media::Vp8Metadata"
+        },
+        {
+          mojom = "media.mojom.Vp9Metadata"
+          cpp = "::media::Vp9Metadata"
+        },
+      ]
+      traits_headers = [ "video_encode_accelerator_mojom_traits.h" ]
+      traits_sources = [ "video_encode_accelerator_mojom_traits.cc" ]
+      traits_public_deps = [
+        "//base",
+        "//media",
+        "//media/base/ipc",
+        "//ui/gfx/geometry/mojom:mojom_traits",
+      ]
+    },
+    {
+      types = [
+        {
+          mojom = "media.mojom.ScalingSettings"
+          cpp = "::media::ScalingSettings"
+        },
+        {
+          mojom = "media.mojom.ResolutionBitrateLimit"
+          cpp = "::media::ResolutionBitrateLimit"
+        },
+        {
+          mojom = "media.mojom.VideoEncoderInfo"
+          cpp = "::media::VideoEncoderInfo"
+        },
+      ]
+      traits_headers = [ "video_encoder_info_mojom_traits.h" ]
+      traits_sources = [ "video_encoder_info_mojom_traits.cc" ]
+      traits_public_deps = [
+        "//base",
+        "//media",
+        "//media/base/ipc",
+        "//ui/gfx/geometry/mojom:mojom_traits",
+      ]
+    },
     {
       types = [
         {

media/mojo/mojom/OWNERS

@@ -2,5 +2,3 @@ per-file *.mojom=set noparent
 per-file *.mojom=file://ipc/SECURITY_OWNERS
 per-file *_mojom_traits*.*=set noparent
 per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS
-per-file *.typemap=set noparent
-per-file *.typemap=file://ipc/SECURITY_OWNERS

media/mojo/mojom/audio_decoder_config.typemap

-# Copyright 2017 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.
-
-mojom = "//media/mojo/mojom/media_types.mojom"
-
-public_headers = [ "//media/base/audio_decoder_config.h" ]
-
-traits_headers = [ "//media/mojo/mojom/audio_decoder_config_mojom_traits.h" ]
-
-sources = [
-  "//media/mojo/mojom/audio_decoder_config_mojom_traits.cc",
-]
-
-public_deps = [
-  "//base",
-  "//media",
-]
-
-deps = [
-  "//media/base/ipc",
-]
-
-# See media_types.typemap for enum mappings.
-type_mappings = [ "media.mojom.AudioDecoderConfig=::media::AudioDecoderConfig" ]

media/mojo/mojom/audio_parameters.typemap

-# Copyright 2016 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.
-
-mojom = "//media/mojo/mojom/audio_parameters.mojom"
-public_headers = [ "//media/base/audio_parameters.h" ]
-traits_headers = [ "//media/base/ipc/media_param_traits.h" ]
-deps = [
-  "//media",
-  "//media/base/ipc",
-]
-type_mappings = [ "media.mojom.AudioParameters=::media::AudioParameters" ]

media/mojo/mojom/cdm_key_information.typemap

-# Copyright 2018 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.
-
-mojom = "//media/mojo/mojom/content_decryption_module.mojom"
-
-public_headers = [ "//media/base/cdm_key_information.h" ]
-
-traits_headers = [ "//media/mojo/mojom/cdm_key_information_mojom_traits.h" ]
-
-sources = [
-  "//media/mojo/mojom/cdm_key_information_mojom_traits.cc",
-]
-
-public_deps = [
-  "//media",
-]
-
-type_mappings = [
-  "media.mojom.CdmKeyInformation=::std::unique_ptr<::media::CdmKeyInformation>[move_only]",
-  "media.mojom.CdmKeyStatus=::media::CdmKeyInformation::KeyStatus",
-]

media/mojo/mojom/content_decryption_module.typemap

-# Copyright 2016 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.
-
-mojom = "//media/mojo/mojom/content_decryption_module.mojom"
-
-public_headers = [
-  "//media/base/cdm_config.h",
-  "//media/base/cdm_key_information.h",
-  "//media/base/cdm_promise.h",
-  "//media/base/eme_constants.h",
-  "//media/base/content_decryption_module.h",
-]
-
-traits_headers = [ "//media/base/ipc/media_param_traits_macros.h" ]
-
-deps = [
-  "//media",
-  "//media/base/ipc",
-]
-
-type_mappings = [
-  "media.mojom.CdmConfig=::media::CdmConfig",
-  "media.mojom.CdmPromiseResult.Exception=::media::CdmPromise::Exception",
-  "media.mojom.CdmSessionType=::media::CdmSessionType",
-  "media.mojom.CdmMessageType=::media::CdmMessageType",
-  "media.mojom.EmeInitDataType=::media::EmeInitDataType",
-  "media.mojom.HdcpVersion=::media::HdcpVersion",
-]

media/mojo/mojom/decryptor.typemap

-# Copyright 2016 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.
-
-mojom = "//media/mojo/mojom/decryptor.mojom"
-
-public_headers = [ "//media/base/decryptor.h" ]
-
-traits_headers = [ "//media/base/ipc/media_param_traits_macros.h" ]
-
-deps = [
-  "//media",
-  "//media/base/ipc",
-]
-
-type_mappings = [
-  "media.mojom.Decryptor.Status=::media::Decryptor::Status",
-  "media.mojom.Decryptor.StreamType=::media::Decryptor::StreamType",
-]

media/mojo/mojom/demuxer_stream.typemap

-# Copyright 2016 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.
-
-mojom = "//media/mojo/mojom/demuxer_stream.mojom"
-
-public_headers = [ "//media/base/demuxer_stream.h" ]
-
-traits_headers = [ "//media/base/ipc/media_param_traits_macros.h" ]
-
-deps = [
-  "//media",
-  "//media/base/ipc",
-]
-
-type_mappings = [
-  "media.mojom.DemuxerStream.Status=::media::DemuxerStream::Status",
-  "media.mojom.DemuxerStream.Type=::media::DemuxerStream::Type",
-]

media/mojo/mojom/encryption_pattern.typemap

-# Copyright 2017 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.
-
-mojom = "//media/mojo/mojom/media_types.mojom"
-
-public_headers = [ "//media/base/encryption_pattern.h" ]
-
-traits_headers = [ "//media/mojo/mojom/encryption_pattern_mojom_traits.h" ]
-
-sources = [
-  "//media/mojo/mojom/encryption_pattern_mojom_traits.cc",
-]
-
-public_deps = [
-  "//media",
-]
-
-deps = [
-  "//media/base/ipc",
-]
-
-# See media_types.typemap for enum mappings.
-type_mappings = [ "media.mojom.EncryptionPattern=::media::EncryptionPattern" ]

media/mojo/mojom/hdr_metadata.typemap

-# Copyright 2017 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.
-
-mojom = "//media/mojo/mojom/media_types.mojom"
-public_headers = [ "//media/base/hdr_metadata.h" ]
-traits_headers = [ "//media/mojo/mojom/hdr_metadata_mojom_traits.h" ]
-type_mappings = [
-  "media.mojom.MasteringMetadata=::media::MasteringMetadata",
-  "media.mojom.HDRMetadata=::media::HDRMetadata",
-]

media/mojo/mojom/media_drm_storage.typemap

-# Copyright 2018 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.
-
-mojom = "//media/mojo/mojom/media_drm_storage.mojom"
-
-public_headers = [ "//media/base/media_drm_key_type.h" ]
-
-traits_headers = [ "//media/base/ipc/media_param_traits_macros.h" ]
-
-deps = [ "//media" ]
-
-type_mappings = [ "media.mojom.SessionData.KeyType=::media::MediaDrmKeyType" ]

media/mojo/mojom/typemaps.gni

-# Copyright 2016 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.
-
-import("//media/media_options.gni")
-
-typemaps = [
-  "//media/mojo/mojom/audio_decoder_config.typemap",
-  "//media/mojo/mojom/audio_parameters.typemap",
-  "//media/mojo/mojom/cdm_key_information.typemap",
-  "//media/mojo/mojom/content_decryption_module.typemap",
-  "//media/mojo/mojom/decryptor.typemap",
-  "//media/mojo/mojom/demuxer_stream.typemap",
-  "//media/mojo/mojom/encryption_pattern.typemap",
-  "//media/mojo/mojom/hdr_metadata.typemap",
-  "//media/mojo/mojom/video_decoder.typemap",
-  "//media/mojo/mojom/video_decoder_config.typemap",
-  "//media/mojo/mojom/video_encode_accelerator.typemap",
-  "//media/mojo/mojom/video_encoder_info.typemap",
-]
-
-if (enable_media_drm_storage) {
-  typemaps += [ "//media/mojo/mojom/media_drm_storage.typemap" ]
-}

media/mojo/mojom/video_decoder.typemap

-# Copyright 2017 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.
-
-mojom = "//media/mojo/mojom/video_decoder.mojom"
-
-public_headers = [
-  "//media/base/overlay_info.h",
-  "//media/video/supported_video_decoder_config.h",
-]
-
-traits_headers = [
-  "//media/base/ipc/media_param_traits_macros.h",
-  "//media/mojo/mojom/supported_video_decoder_config_mojom_traits.h",
-]
-
-sources = [
-  "supported_video_decoder_config_mojom_traits.cc",
-  "supported_video_decoder_config_mojom_traits.h",
-]
-
-deps = [
-  "//media/gpu/ipc/common",
-]
-
-type_mappings = [
-  "media.mojom.OverlayInfo=::media::OverlayInfo",
-  "media.mojom.SupportedVideoDecoderConfig=::media::SupportedVideoDecoderConfig",
-  "media.mojom.VideoDecoderImplementation=::media::VideoDecoderImplementation",
-]

media/mojo/mojom/video_decoder_config.typemap

-# Copyright 2017 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.
-
-mojom = "//media/mojo/mojom/media_types.mojom"
-
-public_headers = [ "//media/base/video_decoder_config.h" ]
-
-traits_headers = [ "//media/mojo/mojom/video_decoder_config_mojom_traits.h" ]
-
-sources = [
-  "video_decoder_config_mojom_traits.cc",
-]
-
-public_deps = [
-  "//base",
-  "//media",
-]
-
-deps = [
-  "//media/base/ipc",
-  "//ui/gfx/geometry/mojom:mojom_traits",
-]
-
-# See media_types.typemap for enum mappings.
-type_mappings = [ "media.mojom.VideoDecoderConfig=::media::VideoDecoderConfig" ]

media/mojo/mojom/video_encode_accelerator.typemap

-# Copyright 2017 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.
-
-mojom = "//media/mojo/mojom/video_encode_accelerator.mojom"
-
-public_headers = [ "//media/video/video_encode_accelerator.h" ]
-
-traits_headers =
-    [ "//media/mojo/mojom/video_encode_accelerator_mojom_traits.h" ]
-
-sources = [
-  "//media/mojo/mojom/video_encode_accelerator_mojom_traits.cc",
-  "//media/mojo/mojom/video_encode_accelerator_mojom_traits.h",
-]
-
-public_deps = [
-  "//base",
-  "//media",
-]
-
-deps = [
-  "//base",
-  "//media",
-  "//media/base/ipc",
-  "//ui/gfx/geometry/mojom:mojom_traits",
-]
-
-type_mappings = [
-  "media.mojom.BitstreamBufferMetadata=::media::BitstreamBufferMetadata",
-  "media.mojom.VideoBitrateAllocation=::media::VideoBitrateAllocation",
-  "media.mojom.VideoEncodeAccelerator.Error=::media::VideoEncodeAccelerator::Error",
-  "media.mojom.VideoEncodeAcceleratorConfig=::media::VideoEncodeAccelerator::Config",
-  "media.mojom.SpatialLayer=::media::VideoEncodeAccelerator::Config::SpatialLayer",
-  "media.mojom.VideoEncodeAcceleratorSupportedProfile=::media::VideoEncodeAccelerator::SupportedProfile",
-  "media.mojom.Vp8Metadata=::media::Vp8Metadata",
-  "media.mojom.Vp9Metadata=::media::Vp9Metadata",
-]

media/mojo/mojom/video_encode_accelerator_mojom_traits.cc

@@ -7,6 +7,7 @@
 #include "base/notreached.h"
 #include "base/optional.h"
 #include "media/base/video_bitrate_allocation.h"
+#include "media/mojo/mojom/video_encode_accelerator.mojom.h"
 #include "mojo/public/cpp/base/time_mojom_traits.h"
 
 namespace mojo {
@@ -28,35 +29,35 @@ bool StructTraits<media::mojom::VideoEncodeAcceleratorSupportedProfileDataView,
 }
 
 // static
-media::mojom::VideoEncodeAccelerator::Error
-EnumTraits<media::mojom::VideoEncodeAccelerator::Error,
+media::mojom::VideoEncodeAccelerator_Error
+EnumTraits<media::mojom::VideoEncodeAccelerator_Error,
            media::VideoEncodeAccelerator::Error>::
     ToMojom(media::VideoEncodeAccelerator::Error error) {
   switch (error) {
     case media::VideoEncodeAccelerator::kIllegalStateError:
-      return media::mojom::VideoEncodeAccelerator::Error::ILLEGAL_STATE;
+      return media::mojom::VideoEncodeAccelerator_Error::ILLEGAL_STATE;
     case media::VideoEncodeAccelerator::kInvalidArgumentError:
-      return media::mojom::VideoEncodeAccelerator::Error::INVALID_ARGUMENT;
+      return media::mojom::VideoEncodeAccelerator_Error::INVALID_ARGUMENT;
     case media::VideoEncodeAccelerator::kPlatformFailureError:
-      return media::mojom::VideoEncodeAccelerator::Error::PLATFORM_FAILURE;
+      return media::mojom::VideoEncodeAccelerator_Error::PLATFORM_FAILURE;
   }
   NOTREACHED();
-  return media::mojom::VideoEncodeAccelerator::Error::INVALID_ARGUMENT;
+  return media::mojom::VideoEncodeAccelerator_Error::INVALID_ARGUMENT;
 }
 
 // static
-bool EnumTraits<media::mojom::VideoEncodeAccelerator::Error,
+bool EnumTraits<media::mojom::VideoEncodeAccelerator_Error,
                 media::VideoEncodeAccelerator::Error>::
-    FromMojom(media::mojom::VideoEncodeAccelerator::Error error,
+    FromMojom(media::mojom::VideoEncodeAccelerator_Error error,
               media::VideoEncodeAccelerator::Error* out) {
   switch (error) {
-    case media::mojom::VideoEncodeAccelerator::Error::ILLEGAL_STATE:
+    case media::mojom::VideoEncodeAccelerator_Error::ILLEGAL_STATE:
       *out = media::VideoEncodeAccelerator::kIllegalStateError;
       return true;
-    case media::mojom::VideoEncodeAccelerator::Error::INVALID_ARGUMENT:
+    case media::mojom::VideoEncodeAccelerator_Error::INVALID_ARGUMENT:
       *out = media::VideoEncodeAccelerator::kInvalidArgumentError;
       return true;
-    case media::mojom::VideoEncodeAccelerator::Error::PLATFORM_FAILURE:
+    case media::mojom::VideoEncodeAccelerator_Error::PLATFORM_FAILURE:
       *out = media::VideoEncodeAccelerator::kPlatformFailureError;
       return true;
   }
@@ -161,30 +162,30 @@ bool StructTraits<media::mojom::Vp9MetadataDataView, media::Vp9Metadata>::Read(
 }
 
 // static
-media::mojom::VideoEncodeAcceleratorConfig::StorageType
-EnumTraits<media::mojom::VideoEncodeAcceleratorConfig::StorageType,
+media::mojom::VideoEncodeAcceleratorConfig_StorageType
+EnumTraits<media::mojom::VideoEncodeAcceleratorConfig_StorageType,
            media::VideoEncodeAccelerator::Config::StorageType>::
     ToMojom(media::VideoEncodeAccelerator::Config::StorageType input) {
   switch (input) {
     case media::VideoEncodeAccelerator::Config::StorageType::kDmabuf:
-      return media::mojom::VideoEncodeAcceleratorConfig::StorageType::kDmabuf;
+      return media::mojom::VideoEncodeAcceleratorConfig_StorageType::kDmabuf;
     case media::VideoEncodeAccelerator::Config::StorageType::kShmem:
-      return media::mojom::VideoEncodeAcceleratorConfig::StorageType::kShmem;
+      return media::mojom::VideoEncodeAcceleratorConfig_StorageType::kShmem;
   }
   NOTREACHED();
-  return media::mojom::VideoEncodeAcceleratorConfig::StorageType::kShmem;
+  return media::mojom::VideoEncodeAcceleratorConfig_StorageType::kShmem;
 }
 
 // static
-bool EnumTraits<media::mojom::VideoEncodeAcceleratorConfig::StorageType,
+bool EnumTraits<media::mojom::VideoEncodeAcceleratorConfig_StorageType,
                 media::VideoEncodeAccelerator::Config::StorageType>::
-    FromMojom(media::mojom::VideoEncodeAcceleratorConfig::StorageType input,
+    FromMojom(media::mojom::VideoEncodeAcceleratorConfig_StorageType input,
               media::VideoEncodeAccelerator::Config::StorageType* output) {
   switch (input) {
-    case media::mojom::VideoEncodeAcceleratorConfig::StorageType::kShmem:
+    case media::mojom::VideoEncodeAcceleratorConfig_StorageType::kShmem:
       *output = media::VideoEncodeAccelerator::Config::StorageType::kShmem;
       return true;
-    case media::mojom::VideoEncodeAcceleratorConfig::StorageType::kDmabuf:
+    case media::mojom::VideoEncodeAcceleratorConfig_StorageType::kDmabuf:
       *output = media::VideoEncodeAccelerator::Config::StorageType::kDmabuf;
       return true;
   }
@@ -193,29 +194,29 @@ bool EnumTraits<media::mojom::VideoEncodeAcceleratorConfig::StorageType,
 }
 
 // static
-media::mojom::VideoEncodeAcceleratorConfig::ContentType
-EnumTraits<media::mojom::VideoEncodeAcceleratorConfig::ContentType,
+media::mojom::VideoEncodeAcceleratorConfig_ContentType
+EnumTraits<media::mojom::VideoEncodeAcceleratorConfig_ContentType,
            media::VideoEncodeAccelerator::Config::ContentType>::
     ToMojom(media::VideoEncodeAccelerator::Config::ContentType input) {
   switch (input) {
     case media::VideoEncodeAccelerator::Config::ContentType::kDisplay:
-      return media::mojom::VideoEncodeAcceleratorConfig::ContentType::kDisplay;
+      return media::mojom::VideoEncodeAcceleratorConfig_ContentType::kDisplay;
     case media::VideoEncodeAccelerator::Config::ContentType::kCamera:
-      return media::mojom::VideoEncodeAcceleratorConfig::ContentType::kCamera;
+      return media::mojom::VideoEncodeAcceleratorConfig_ContentType::kCamera;
   }
   NOTREACHED();
-  return media::mojom::VideoEncodeAcceleratorConfig::ContentType::kCamera;
+  return media::mojom::VideoEncodeAcceleratorConfig_ContentType::kCamera;
 }
 // static
-bool EnumTraits<media::mojom::VideoEncodeAcceleratorConfig::ContentType,
+bool EnumTraits<media::mojom::VideoEncodeAcceleratorConfig_ContentType,
                 media::VideoEncodeAccelerator::Config::ContentType>::
-    FromMojom(media::mojom::VideoEncodeAcceleratorConfig::ContentType input,
+    FromMojom(media::mojom::VideoEncodeAcceleratorConfig_ContentType input,
               media::VideoEncodeAccelerator::Config::ContentType* output) {
   switch (input) {
-    case media::mojom::VideoEncodeAcceleratorConfig::ContentType::kCamera:
+    case media::mojom::VideoEncodeAcceleratorConfig_ContentType::kCamera:
       *output = media::VideoEncodeAccelerator::Config::ContentType::kCamera;
       return true;
-    case media::mojom::VideoEncodeAcceleratorConfig::ContentType::kDisplay:
+    case media::mojom::VideoEncodeAcceleratorConfig_ContentType::kDisplay:
       *output = media::VideoEncodeAccelerator::Config::ContentType::kDisplay;
       return true;
   }

media/mojo/mojom/video_encode_accelerator_mojom_traits.h

@@ -6,8 +6,8 @@
 #define MEDIA_MOJO_MOJOM_VIDEO_ENCODE_ACCELERATOR_MOJOM_TRAITS_H_
 
 #include "media/base/ipc/media_param_traits.h"
-#include "media/mojo/mojom/media_types.mojom.h"
-#include "media/mojo/mojom/video_encode_accelerator.mojom.h"
+#include "media/mojo/mojom/media_types.mojom-shared.h"
+#include "media/mojo/mojom/video_encode_accelerator.mojom-shared.h"
 #include "media/video/video_encode_accelerator.h"
 #include "ui/gfx/geometry/mojom/geometry_mojom_traits.h"
 
@@ -48,12 +48,12 @@ struct StructTraits<
 };
 
 template <>
-struct EnumTraits<media::mojom::VideoEncodeAccelerator::Error,
+struct EnumTraits<media::mojom::VideoEncodeAccelerator_Error,
                   media::VideoEncodeAccelerator::Error> {
-  static media::mojom::VideoEncodeAccelerator::Error ToMojom(
+  static media::mojom::VideoEncodeAccelerator_Error ToMojom(
       media::VideoEncodeAccelerator::Error error);
 
-  static bool FromMojom(media::mojom::VideoEncodeAccelerator::Error input,
+  static bool FromMojom(media::mojom::VideoEncodeAccelerator_Error input,
                         media::VideoEncodeAccelerator::Error* out);
 };
 
@@ -167,24 +167,24 @@ class StructTraits<media::mojom::Vp9MetadataDataView, media::Vp9Metadata> {
 };
 
 template <>
-struct EnumTraits<media::mojom::VideoEncodeAcceleratorConfig::StorageType,
+struct EnumTraits<media::mojom::VideoEncodeAcceleratorConfig_StorageType,
                   media::VideoEncodeAccelerator::Config::StorageType> {
-  static media::mojom::VideoEncodeAcceleratorConfig::StorageType ToMojom(
+  static media::mojom::VideoEncodeAcceleratorConfig_StorageType ToMojom(
       media::VideoEncodeAccelerator::Config::StorageType input);
 
   static bool FromMojom(
-      media::mojom::VideoEncodeAcceleratorConfig::StorageType,
+      media::mojom::VideoEncodeAcceleratorConfig_StorageType,
       media::VideoEncodeAccelerator::Config::StorageType* output);
 };
 
 template <>
-struct EnumTraits<media::mojom::VideoEncodeAcceleratorConfig::ContentType,
+struct EnumTraits<media::mojom::VideoEncodeAcceleratorConfig_ContentType,
                   media::VideoEncodeAccelerator::Config::ContentType> {
-  static media::mojom::VideoEncodeAcceleratorConfig::ContentType ToMojom(
+  static media::mojom::VideoEncodeAcceleratorConfig_ContentType ToMojom(
       media::VideoEncodeAccelerator::Config::ContentType input);
 
   static bool FromMojom(
-      media::mojom::VideoEncodeAcceleratorConfig::ContentType,
+      media::mojom::VideoEncodeAcceleratorConfig_ContentType,
       media::VideoEncodeAccelerator::Config::ContentType* output);
 };
 

media/mojo/mojom/video_encode_accelerator_mojom_traits_unittest.cc

@@ -3,8 +3,9 @@
 // found in the LICENSE file.
 
 #include "media/mojo/mojom/video_encode_accelerator_mojom_traits.h"
-#include "media/mojo/mojom/video_encoder_info_mojom_traits.h"
 
+#include "media/mojo/mojom/video_encode_accelerator.mojom.h"
+#include "media/mojo/mojom/video_encoder_info_mojom_traits.h"
 #include "media/video/video_encode_accelerator.h"
 #include "media/video/video_encoder_info.h"
 #include "mojo/public/cpp/test_support/test_utils.h"

media/mojo/mojom/video_encoder_info.typemap

-# Copyright 2019 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.
-
-mojom = "//media/mojo/mojom/video_encoder_info.mojom"
-
-public_headers = [ "//media/video/video_encoder_info.h" ]
-
-traits_headers = [ "//media/mojo/mojom/video_encoder_info_mojom_traits.h" ]
-
-sources = [
-  "//media/mojo/mojom/video_encoder_info_mojom_traits.cc",
-  "//media/mojo/mojom/video_encoder_info_mojom_traits.h",
-]
-
-public_deps = [
-  "//base",
-  "//media",
-]
-
-deps = [
-  "//media/base/ipc",
-  "//ui/gfx/geometry/mojom:mojom_traits",
-]
-
-type_mappings = [
-  "media.mojom.ScalingSettings=::media::ScalingSettings",
-  "media.mojom.ResolutionBitrateLimit=::media::ResolutionBitrateLimit",
-  "media.mojom.VideoEncoderInfo=::media::VideoEncoderInfo",
-]

media/mojo/mojom/video_encoder_info_mojom_traits.h

@@ -6,7 +6,7 @@
 #define MEDIA_MOJO_MOJOM_VIDEO_ENCODER_INFO_MOJOM_TRAITS_H_
 
 #include "base/containers/span.h"
-#include "media/mojo/mojom/video_encoder_info.mojom.h"
+#include "media/mojo/mojom/video_encoder_info.mojom-shared.h"
 #include "media/video/video_encoder_info.h"
 #include "ui/gfx/geometry/mojom/geometry_mojom_traits.h"
 

media/mojo/services/mojo_media_drm_storage.cc

@@ -11,6 +11,7 @@
 #include "base/bind_helpers.h"
 #include "base/optional.h"
 #include "base/unguessable_token.h"
+#include "media/mojo/mojom/media_drm_storage.mojom.h"
 #include "mojo/public/cpp/bindings/callback_helpers.h"
 
 namespace media {

mojo/public/tools/bindings/chromium_bindings_configuration.gni

@@ -21,7 +21,6 @@ _typemap_imports = [
   "//components/typemaps.gni",
   "//content/browser/typemaps.gni",
   "//content/public/common/typemaps.gni",
-  "//media/mojo/mojom/typemaps.gni",
   "//sandbox/mac/mojom/typemaps.gni",
   "//services/media_session/public/cpp/typemaps.gni",
   "//services/proxy_resolver/public/cpp/typemaps.gni",

third_party/blink/renderer/platform/mojo/blink_typemaps.gni

@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 typemaps = [
-  "//media/mojo/mojom/audio_parameters.typemap",
   "//third_party/blink/common/feature_policy/feature_policy.typemap",
   "//third_party/blink/common/frame/frame_policy.typemap",
   "//third_party/blink/public/common/loader/url_loader_factory_bundle.typemap",