Rename traits and mojo directory in //media/mojo

This CL renames mojo to mojom and *_struct_traits.* to *_mojom_traits.* in //media/mojo. *_struct_traits.* => *_mojom_traits.* media/mojo/interfaces => media/mojo/mojom Bug: 806965 Change-Id: I62871e855f32640d5a39bfbcc2889118d0d46886 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1724839 Reviewed-by: Yuchen Liu <yucliu@chromium.org> Reviewed-by: Colin Blundell <blundell@chromium.org> Reviewed-by: Yuri Wiitala <miu@chromium.org> Reviewed-by: Xiaohan Wang <xhwang@chromium.org> Reviewed-by: Ken Rockot <rockot@google.com> Reviewed-by: Kinuko Yasuda <kinuko@chromium.org> Commit-Queue: Miyoung Shin <myid.shin@igalia.com> Cr-Commit-Position: refs/heads/master@{#683815}
FairyWorld · Aug 3, 2019 · 25bb8c0 · 25bb8c0
1 parent 9c7cfb9
commit 25bb8c0
Show file tree

Hide file tree

Showing 345 changed files with 551 additions and 553 deletions.
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
@@ -2110,8 +2110,8 @@ jumbo_split_static_library("browser") {
     "//media/midi",
     "//media/mojo:buildflags",
     "//media/mojo/common",
-    "//media/mojo/interfaces:mirror_service_remoting",
-    "//media/mojo/interfaces:remoting",
+    "//media/mojo/mojom:mirror_service_remoting",
+    "//media/mojo/mojom:remoting",
     "//media/mojo/services",
     "//media/webrtc",
     "//mojo/core/embedder",
@@ -2861,7 +2861,7 @@ jumbo_split_static_library("browser") {
       "//components/send_tab_to_self",
       "//components/signin/internal/identity_manager",  # see android/signin/DEPS
       "//media/mojo/clients",
-      "//media/mojo/interfaces:constants",
+      "//media/mojo/mojom:constants",
       "//rlz:rlz_utils",
       "//sandbox",
       "//sandbox:sandbox_buildflags",
@@ -4529,7 +4529,7 @@ jumbo_split_static_library("browser") {
       "media/output_protection_impl.cc",
       "media/output_protection_impl.h",
     ]
-    deps += [ "//media/mojo/interfaces" ]
+    deps += [ "//media/mojo/mojom" ]
 
     if (enable_widevine) {
       if (enable_widevine_cdm_component) {
@@ -4562,7 +4562,7 @@ jumbo_split_static_library("browser") {
 
     if (mojo_media_host == "browser") {
       deps += [
-        "//media/mojo/interfaces:constants",
+        "//media/mojo/mojom:constants",
         "//media/mojo/services",
       ]
     }

diff --git a/chrome/browser/android/download/download_media_parser.cc b/chrome/browser/android/download/download_media_parser.cc
@@ -18,8 +18,8 @@
 #include "media/base/overlay_info.h"
 #include "media/base/video_thumbnail_decoder.h"
 #include "media/mojo/clients/mojo_video_decoder.h"
-#include "media/mojo/interfaces/constants.mojom.h"
-#include "media/mojo/interfaces/media_service.mojom.h"
+#include "media/mojo/mojom/constants.mojom.h"
+#include "media/mojo/mojom/media_service.mojom.h"
 #include "media/mojo/services/media_interface_provider.h"
 #include "media/renderers/paint_canvas_video_renderer.h"
 #include "media/video/gpu_video_accelerator_factories.h"

diff --git a/chrome/browser/android/download/download_media_parser.h b/chrome/browser/android/download/download_media_parser.h
@@ -22,7 +22,7 @@
 #include "chrome/services/media_gallery_util/public/cpp/media_parser_provider.h"
 #include "chrome/services/media_gallery_util/public/mojom/media_parser.mojom.h"
 #include "media/base/media_log.h"
-#include "media/mojo/interfaces/interface_factory.mojom.h"
+#include "media/mojo/mojom/interface_factory.mojom.h"
 
 namespace media {
 class GpuVideoAcceleratorFactories;

diff --git a/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc b/chrome/browser/browsing_data/browsing_data_remover_browsertest.cc
@@ -67,7 +67,7 @@
 #include "google_apis/gaia/gaia_urls.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "media/base/media_switches.h"
-#include "media/mojo/interfaces/media_types.mojom.h"
+#include "media/mojo/mojom/media_types.mojom.h"
 #include "media/mojo/services/video_decode_perf_history.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/dns/mock_host_resolver.h"

diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
@@ -598,7 +598,7 @@
 #endif
 
 #if BUILDFLAG(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
-#include "media/mojo/interfaces/constants.mojom.h"      // nogncheck
+#include "media/mojo/mojom/constants.mojom.h"      // nogncheck
 #include "media/mojo/services/media_service_factory.h"  // nogncheck
 #endif
 

diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn
@@ -225,7 +225,7 @@ source_set("chromeos") {
     "//gpu/ipc/host",
     "//gpu/ipc/service",
     "//media",
-    "//media/mojo/interfaces",
+    "//media/mojo/mojom",
     "//mojo/public/cpp/platform",
     "//mojo/public/cpp/system",
     "//net",

diff --git a/chrome/browser/chromeos/DEPS b/chrome/browser/chromeos/DEPS
@@ -12,7 +12,7 @@ include_rules = [
   "+mash/public/mojom",
   "+media/audio/sounds",  # For system sounds
   "+media/base/media_switches.h",  # For media command line switches.
-  "+media/mojo/interfaces",  # For platform verification mojom interface.
+  "+media/mojo/mojom",  # For platform verification mojom interface.
   "+remoting/host/it2me",  # For CRD host in remote command
   "+services/device/public",
   "+services/metrics/public",

diff --git a/chrome/browser/media/DEPS b/chrome/browser/media/DEPS
@@ -6,7 +6,7 @@ include_rules = [
   "+media/cdm/cdm_proxy.h",
   "+media/cdm/supported_cdm_versions.h",
   "+media/media_buildflags.h",
-  "+media/mojo/interfaces",
+  "+media/mojo/mojom",
   # safe_dial_device_description_parser_unittest.cc needs DataDecoderService.
   "+services/data_decoder/data_decoder_service.h",
   "+services/data_decoder/public",

diff --git a/chrome/browser/media/android/cdm/media_drm_storage_factory.h b/chrome/browser/media/android/cdm/media_drm_storage_factory.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_MEDIA_ANDROID_CDM_MEDIA_DRM_STORAGE_FACTORY_H_
 #define CHROME_BROWSER_MEDIA_ANDROID_CDM_MEDIA_DRM_STORAGE_FACTORY_H_
 
-#include "media/mojo/interfaces/media_drm_storage.mojom.h"
+#include "media/mojo/mojom/media_drm_storage.mojom.h"
 
 namespace content {
 class RenderFrameHost;

diff --git a/chrome/browser/media/cast_mirroring_service_host_browsertest.cc b/chrome/browser/media/cast_mirroring_service_host_browsertest.cc
@@ -22,8 +22,8 @@
 #include "media/capture/mojom/video_capture.mojom.h"
 #include "media/capture/mojom/video_capture_types.mojom.h"
 #include "media/capture/video_capture_types.h"
-#include "media/mojo/interfaces/audio_data_pipe.mojom.h"
-#include "media/mojo/interfaces/audio_input_stream.mojom.h"
+#include "media/mojo/mojom/audio_data_pipe.mojom.h"
+#include "media/mojo/mojom/audio_input_stream.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "testing/gmock/include/gmock/gmock.h"
 

diff --git a/chrome/browser/media/cast_remoting_connector.h b/chrome/browser/media/cast_remoting_connector.h
@@ -13,9 +13,9 @@
 #include "base/supports_user_data.h"
 #include "components/prefs/pref_change_registrar.h"
 #include "components/sessions/core/session_id.h"
-#include "media/mojo/interfaces/mirror_service_remoting.mojom.h"
-#include "media/mojo/interfaces/remoting.mojom.h"
-#include "media/mojo/interfaces/remoting_common.mojom.h"
+#include "media/mojo/mojom/mirror_service_remoting.mojom.h"
+#include "media/mojo/mojom/remoting.mojom.h"
+#include "media/mojo/mojom/remoting_common.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace content {

diff --git a/chrome/browser/media/cast_remoting_connector_unittest.cc b/chrome/browser/media/cast_remoting_connector_unittest.cc
@@ -19,8 +19,8 @@
 #include "components/sync_preferences/testing_pref_service_syncable.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
-#include "media/mojo/interfaces/mirror_service_remoting.mojom.h"
-#include "media/mojo/interfaces/remoting.mojom.h"
+#include "media/mojo/mojom/mirror_service_remoting.mojom.h"
+#include "media/mojo/mojom/remoting.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

diff --git a/chrome/browser/media/output_protection_impl.h b/chrome/browser/media/output_protection_impl.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_MEDIA_OUTPUT_PROTECTION_IMPL_H_
 
 #include "content/public/browser/frame_service_base.h"
-#include "media/mojo/interfaces/output_protection.mojom.h"
+#include "media/mojo/mojom/output_protection.mojom.h"
 
 class OutputProtectionProxy;
 

diff --git a/chrome/browser/media/platform_verification_impl.h b/chrome/browser/media/platform_verification_impl.h
@@ -10,7 +10,7 @@
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "content/public/browser/frame_service_base.h"
-#include "media/mojo/interfaces/platform_verification.mojom.h"
+#include "media/mojo/mojom/platform_verification.mojom.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h"

diff --git a/chrome/browser/media/webrtc/desktop_capture_devices_util.cc b/chrome/browser/media/webrtc/desktop_capture_devices_util.cc
@@ -16,7 +16,7 @@
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/browser_thread.h"
 #include "media/audio/audio_device_description.h"
-#include "media/mojo/interfaces/display_media_information.mojom.h"
+#include "media/mojo/mojom/display_media_information.mojom.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {

diff --git a/chrome/browser/usb/web_usb_service_impl.cc b/chrome/browser/usb/web_usb_service_impl.cc
@@ -14,7 +14,7 @@
 #include "chrome/browser/usb/usb_chooser_context_factory.h"
 #include "chrome/browser/usb/usb_tab_helper.h"
 #include "content/public/browser/browser_thread.h"
-#include "media/mojo/interfaces/remoting_common.mojom.h"
+#include "media/mojo/mojom/remoting_common.mojom.h"
 #include "services/device/public/mojom/usb_enumeration_options.mojom.h"
 
 WebUsbServiceImpl::WebUsbServiceImpl(

diff --git a/chrome/common/media_router/mojom/BUILD.gn b/chrome/common/media_router/mojom/BUILD.gn
@@ -23,7 +23,7 @@ mojom("media_router") {
   public_deps = [
     ":media_controller",
     "//components/mirroring/mojom:host",
-    "//media/mojo/interfaces:mirror_service_remoting",
+    "//media/mojo/mojom:mirror_service_remoting",
     "//mojo/public/mojom/base",
     "//services/network/public/mojom:mojom_ip_address",
     "//third_party/blink/public/mojom:mojom_platform",

diff --git a/chrome/common/media_router/mojom/media_router.mojom b/chrome/common/media_router/mojom/media_router.mojom
@@ -7,7 +7,7 @@ module media_router.mojom;
 import "chrome/common/media_router/mojom/media_controller.mojom";
 import "chrome/common/media_router/mojom/media_status.mojom";
 import "components/mirroring/mojom/mirroring_service_host.mojom";
-import "media/mojo/interfaces/mirror_service_remoting.mojom";
+import "media/mojo/mojom/mirror_service_remoting.mojom";
 import "mojo/public/mojom/base/time.mojom";
 import "services/network/public/mojom/ip_address.mojom";
 import "services/network/public/mojom/ip_endpoint.mojom";

diff --git a/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc b/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc
@@ -225,10 +225,10 @@ void ChromeExtensionsDispatcherDelegate::PopulateSourceMap(
                              IDR_MOJO_IP_ENDPOINT_MOJOM_JS);
   source_map->RegisterSource("url/mojom/origin.mojom", IDR_ORIGIN_MOJOM_JS);
   source_map->RegisterSource("url/mojom/url.mojom", IDR_MOJO_URL_MOJOM_JS);
-  source_map->RegisterSource("media/mojo/interfaces/remoting_common.mojom",
+  source_map->RegisterSource("media/mojo/mojom/remoting_common.mojom",
                              IDR_REMOTING_COMMON_JS);
   source_map->RegisterSource(
-      "media/mojo/interfaces/mirror_service_remoting.mojom",
+      "media/mojo/mojom/mirror_service_remoting.mojom",
       IDR_MEDIA_REMOTING_JS);
   source_map->RegisterSource(
       "components/mirroring/mojom/mirroring_service_host.mojom",

diff --git a/chrome/renderer/media/DEPS b/chrome/renderer/media/DEPS
@@ -5,5 +5,5 @@ include_rules = [
   "+media/base",  # For basic media functions.
   "+media/cast",  # For cast streaming library.
   "+media/capture",  # For capture library.
-  "+media/mojo/interfaces",  # For mojo interfaces.
+  "+media/mojo/mojom",  # For mojo interfaces.
 ]
diff --git a/chrome/renderer/resources/extensions/media_router_bindings.js b/chrome/renderer/resources/extensions/media_router_bindings.js
@@ -17,8 +17,8 @@ loadScript('components/mirroring/mojom/mirroring_service_host.mojom');
 loadScript('components/mirroring/mojom/session_observer.mojom');
 loadScript('components/mirroring/mojom/session_parameters.mojom');
 loadScript('extensions/common/mojom/keep_alive.mojom');
-loadScript('media/mojo/interfaces/mirror_service_remoting.mojom');
-loadScript('media/mojo/interfaces/remoting_common.mojom');
+loadScript('media/mojo/mojom/mirror_service_remoting.mojom');
+loadScript('media/mojo/mojom/remoting_common.mojom');
 loadScript('mojo/public/mojom/base/time.mojom');
 loadScript('mojo/public/mojom/base/unguessable_token.mojom');
 loadScript('net/interfaces/ip_address.mojom');

diff --git a/chrome/renderer/resources/renderer_resources.grd b/chrome/renderer/resources/renderer_resources.grd
@@ -88,8 +88,8 @@
         <include name="IDR_MOJO_IP_ENDPOINT_MOJOM_JS" file="${mojom_root}\services\network\public\mojom\ip_endpoint.mojom.js" use_base_dir="false" type="BINDATA" />
         <include name="IDR_ORIGIN_MOJOM_JS" file="${mojom_root}\url\mojom\origin.mojom.js" use_base_dir="false" type="BINDATA" />
         <include name="IDR_MOJO_URL_MOJOM_JS" file="${mojom_root}\url\mojom\url.mojom.js" use_base_dir="false" type="BINDATA" />
-        <include name="IDR_MEDIA_REMOTING_JS" file="${mojom_root}\media\mojo\interfaces\mirror_service_remoting.mojom.js" use_base_dir="false" type="BINDATA" />
-        <include name="IDR_REMOTING_COMMON_JS" file="${mojom_root}\media\mojo\interfaces\remoting_common.mojom.js" use_base_dir="false" type="BINDATA" />
+        <include name="IDR_MEDIA_REMOTING_JS" file="${mojom_root}\media\mojo\mojom\mirror_service_remoting.mojom.js" use_base_dir="false" type="BINDATA" />
+        <include name="IDR_REMOTING_COMMON_JS" file="${mojom_root}\media\mojo\mojom\remoting_common.mojom.js" use_base_dir="false" type="BINDATA" />
       </if>
     </includes>
   </release>

diff --git a/chrome/services/media_gallery_util/public/mojom/BUILD.gn b/chrome/services/media_gallery_util/public/mojom/BUILD.gn
@@ -11,7 +11,7 @@ mojom("mojom") {
   ]
 
   public_deps = [
-    "//media/mojo/interfaces",
+    "//media/mojo/mojom",
     "//mojo/public/mojom/base",
   ]
 }
diff --git a/chrome/services/media_gallery_util/public/mojom/media_parser.mojom b/chrome/services/media_gallery_util/public/mojom/media_parser.mojom
@@ -4,7 +4,7 @@
 
 module chrome.mojom;
 
-import "media/mojo/interfaces/media_types.mojom";
+import "media/mojo/mojom/media_types.mojom";
 import "mojo/public/mojom/base/file.mojom";
 import "mojo/public/mojom/base/time.mojom";
 import "mojo/public/mojom/base/values.mojom";

diff --git a/chromecast/browser/BUILD.gn b/chromecast/browser/BUILD.gn
@@ -270,7 +270,7 @@ cast_source_set("browser") {
 
   if (enable_mojo_media) {
     deps += [
-      "//media/mojo/interfaces:constants",
+      "//media/mojo/mojom:constants",
       "//media/mojo/services",
     ]
   }

diff --git a/chromecast/browser/application_media_info_manager.h b/chromecast/browser/application_media_info_manager.h
@@ -11,7 +11,7 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "content/public/browser/frame_service_base.h"
-#include "media/mojo/interfaces/cast_application_media_info_manager.mojom.h"
+#include "media/mojo/mojom/cast_application_media_info_manager.mojom.h"
 
 namespace content {
 class RenderFrameHost;

diff --git a/chromecast/browser/cast_content_browser_client.cc b/chromecast/browser/cast_content_browser_client.cc
@@ -84,7 +84,7 @@
 
 #if BUILDFLAG(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
 #include "chromecast/media/service/cast_mojo_media_client.h"
-#include "media/mojo/interfaces/constants.mojom.h"  // nogncheck
+#include "media/mojo/mojom/constants.mojom.h"  // nogncheck
 #include "media/mojo/services/media_service.h"      // nogncheck
 #endif  // ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS
 

diff --git a/chromecast/media/service/BUILD.gn b/chromecast/media/service/BUILD.gn
@@ -13,7 +13,7 @@ cast_source_set("service") {
   ]
 
   public_deps = [
-    "//media/mojo/interfaces",
+    "//media/mojo/mojom",
     "//media/mojo/services",
     "//services/service_manager/public/cpp",
   ]

diff --git a/chromecast/media/service/cast_renderer.h b/chromecast/media/service/cast_renderer.h
@@ -15,7 +15,7 @@
 #include "chromecast/media/cma/backend/cma_backend_factory.h"
 #include "media/base/renderer.h"
 #include "media/base/waiting.h"
-#include "media/mojo/interfaces/cast_application_media_info_manager.mojom.h"
+#include "media/mojo/mojom/cast_application_media_info_manager.mojom.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace base {

diff --git a/components/cdm/browser/BUILD.gn b/components/cdm/browser/BUILD.gn
@@ -15,7 +15,7 @@ jumbo_source_set("browser") {
   public_deps = [
     "//base",
     "//content/public/browser",
-    "//media/mojo/interfaces",
+    "//media/mojo/mojom",
     "//url",
   ]
 

diff --git a/components/cdm/browser/media_drm_storage_impl.h b/components/cdm/browser/media_drm_storage_impl.h
@@ -18,7 +18,7 @@
 #include "content/public/browser/frame_service_base.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents_observer.h"
-#include "media/mojo/interfaces/media_drm_storage.mojom.h"
+#include "media/mojo/mojom/media_drm_storage.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "url/gurl.h"
 #include "url/origin.h"

diff --git a/components/chromeos_camera/common/BUILD.gn b/components/chromeos_camera/common/BUILD.gn
@@ -11,7 +11,7 @@ mojom("common") {
   ]
 
   public_deps = [
-    "//media/mojo/interfaces",
+    "//media/mojo/mojom",
     "//mojo/public/mojom/base",
     "//ui/gfx/geometry/mojom",
   ]

diff --git a/components/chromeos_camera/common/jpeg_encode_accelerator.mojom b/components/chromeos_camera/common/jpeg_encode_accelerator.mojom
@@ -4,7 +4,7 @@
 
 module chromeos_camera.mojom;
 
-import "media/mojo/interfaces/media_types.mojom";
+import "media/mojo/mojom/media_types.mojom";
 
 // Encode errors (see components/chromeos_camera/jpeg_encode_accelerator.h).
 enum EncodeStatus {

diff --git a/components/chromeos_camera/common/mjpeg_decode_accelerator.mojom b/components/chromeos_camera/common/mjpeg_decode_accelerator.mojom
@@ -4,7 +4,7 @@
 
 module chromeos_camera.mojom;
 
-import "media/mojo/interfaces/media_types.mojom";
+import "media/mojo/mojom/media_types.mojom";
 import "mojo/public/mojom/base/time.mojom";
 import "ui/gfx/geometry/mojom/geometry.mojom";
 

diff --git a/components/mirroring/browser/BUILD.gn b/components/mirroring/browser/BUILD.gn
@@ -22,7 +22,7 @@ source_set("browser") {
     "//media/cast:common",
     "//media/cast:net",
     "//media/mojo/common:common",
-    "//media/mojo/interfaces:remoting",
+    "//media/mojo/mojom:remoting",
     "//mojo/public/cpp/bindings",
   ]
 }
@@ -42,7 +42,7 @@ source_set("unittests") {
     "//media/cast:common",
     "//media/cast:net",
     "//media/cast:test_support",
-    "//media/mojo/interfaces:remoting",
+    "//media/mojo/mojom:remoting",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/system",
     "//testing/gmock",

diff --git a/components/mirroring/browser/cast_remoting_sender.h b/components/mirroring/browser/cast_remoting_sender.h
@@ -12,7 +12,7 @@
 #include "media/cast/cast_config.h"
 #include "media/cast/net/cast_transport.h"
 #include "media/cast/net/rtcp/rtcp_defines.h"
-#include "media/mojo/interfaces/remoting.mojom.h"
+#include "media/mojo/mojom/remoting.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace media {

diff --git a/components/mirroring/browser/cast_remoting_sender_unittest.cc b/components/mirroring/browser/cast_remoting_sender_unittest.cc
@@ -14,7 +14,7 @@
 #include "media/cast/constants.h"
 #include "media/cast/net/cast_transport.h"
 #include "media/cast/test/utility/default_config.h"
-#include "media/mojo/interfaces/remoting.mojom.h"
+#include "media/mojo/mojom/remoting.mojom.h"
 #include "mojo/public/cpp/system/data_pipe.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

diff --git a/components/mirroring/mojom/BUILD.gn b/components/mirroring/mojom/BUILD.gn
@@ -42,8 +42,8 @@ mojom("service") {
   public_deps = [
     ":common",
     "//media/capture/mojom:video_capture",
-    "//media/mojo/interfaces:interfaces",
-    "//media/mojo/interfaces:remoting",
+    "//media/mojo/mojom",
+    "//media/mojo/mojom:remoting",
     "//services/network/public/mojom",
     "//ui/gfx/geometry/mojom",
   ]