Mojom traits: rename incorrectly named files in media code.

Change-Id: Id1fee120b7d61cc41cd359389bf5d05f28dac674
Reviewed-on: https://chromium-review.googlesource.com/1162430Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580694}

content/common/media/OWNERS

@@ -7,6 +7,9 @@ per-file *_messages*.h=file://ipc/SECURITY_OWNERS
 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 *_param_traits*.*=set noparent
 per-file *_param_traits*.*=file://ipc/SECURITY_OWNERS
 
@@ -16,7 +19,4 @@ per-file *_struct_traits*.*=file://ipc/SECURITY_OWNERS
 per-file *.typemap=set noparent
 per-file *.typemap=file://ipc/SECURITY_OWNERS
 
-per-file *_typemap_traits*.*=set noparent
-per-file *_typemap_traits*.*=file://ipc/SECURITY_OWNERS
-
 # COMPONENT: Internals>Media

content/common/media/media_devices.typemap

@@ -4,9 +4,9 @@
 
 mojom = "//third_party/blink/public/platform/modules/mediastream/media_devices.mojom"
 public_headers = [ "//content/common/media/media_devices.h" ]
-traits_headers = [ "//content/common/media/media_devices_typemap_traits.h" ]
+traits_headers = [ "//content/common/media/media_devices_mojom_traits.h" ]
 sources = [
-  "//content/common/media/media_devices_typemap_traits.cc",
+  "//content/common/media/media_devices_mojom_traits.cc",
 ]
 type_mappings = [
   "blink.mojom.MediaDeviceType=content::MediaDeviceType",

content/common/media/media_devices_typemap_traits.cc → content/common/media/media_devices_mojom_traits.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 "content/common/media/media_devices_typemap_traits.h"
+#include "content/common/media/media_devices_mojom_traits.h"
 
 #include "base/logging.h"
 

content/common/media/media_devices_typemap_traits.h → content/common/media/media_devices_mojom_traits.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 CONTENT_COMMON_MEDIA_MEDIA_DEVICES_TYPEMAP_TRAITS_H_
-#define CONTENT_COMMON_MEDIA_MEDIA_DEVICES_TYPEMAP_TRAITS_H_
+#ifndef CONTENT_COMMON_MEDIA_MEDIA_DEVICES_MOJOM_TRAITS_H_
+#define CONTENT_COMMON_MEDIA_MEDIA_DEVICES_MOJOM_TRAITS_H_
 
 #include "content/common/media/media_devices.h"
 #include "third_party/blink/public/platform/modules/mediastream/media_devices.mojom.h"
@@ -47,4 +47,4 @@ struct StructTraits<blink::mojom::MediaDeviceInfoDataView,
 
 }  // namespace mojo
 
-#endif  // CONTENT_COMMON_MEDIA_MEDIA_DEVICES_TYPEMAP_TRAITS_H_
\ No newline at end of file
+#endif  // CONTENT_COMMON_MEDIA_MEDIA_DEVICES_MOJOM_TRAITS_H_

content/common/media/media_stream.typemap

@@ -11,11 +11,11 @@ public_headers = [
 
 traits_headers = [
   "//content/common/media/media_stream_param_traits.h",
-  "//content/common/media/media_stream_typemap_traits.h",
+  "//content/common/media/media_stream_mojom_traits.h",
 ]
 
 sources = [
-  "//content/common/media/media_stream_typemap_traits.cc",
+  "//content/common/media/media_stream_mojom_traits.cc",
 ]
 
 deps = [

content/common/media/media_stream_typemap_traits.cc → content/common/media/media_stream_mojom_traits.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 "content/common/media/media_stream_typemap_traits.h"
+#include "content/common/media/media_stream_mojom_traits.h"
 
 #include "base/logging.h"
 

content/common/media/media_stream_typemap_traits.h → content/common/media/media_stream_mojom_traits.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 CONTENT_COMMON_MEDIA_MEDIA_STREAM_TYPEMAP_TRAITS_H_
-#define CONTENT_COMMON_MEDIA_MEDIA_STREAM_TYPEMAP_TRAITS_H_
+#ifndef CONTENT_COMMON_MEDIA_MEDIA_STREAM_MOJOM_TRAITS_H_
+#define CONTENT_COMMON_MEDIA_MEDIA_STREAM_MOJOM_TRAITS_H_
 
 #include "content/common/media/media_stream.mojom.h"
 #include "content/common/media/media_stream_controls.h"
@@ -76,4 +76,4 @@ struct StructTraits<content::mojom::StreamControlsDataView,
 
 }  // namespace mojo
 
-#endif  // CONTENT_COMMON_MEDIA_MEDIA_STREAM_TYPEMAP_TRAITS_H_
+#endif  // CONTENT_COMMON_MEDIA_MEDIA_STREAM_MOJOM_TRAITS_H_

media/mojo/interfaces/OWNERS

 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 *_struct_traits*.*=set noparent
 per-file *_struct_traits*.*=file://ipc/SECURITY_OWNERS
 per-file *.typemap=set noparent

media/mojo/interfaces/jpeg_decode_accelerator.typemap

@@ -10,10 +10,10 @@ public_headers = [
 ]
 
 traits_headers =
-    [ "//media/mojo/interfaces/jpeg_decode_accelerator_typemap_traits.h" ]
+    [ "//media/mojo/interfaces/jpeg_decode_accelerator_mojom_traits.h" ]
 
 sources = [
-  "//media/mojo/interfaces/jpeg_decode_accelerator_typemap_traits.cc",
+  "//media/mojo/interfaces/jpeg_decode_accelerator_mojom_traits.cc",
 ]
 
 deps = [

media/mojo/interfaces/jpeg_decode_accelerator_typemap_traits.cc → media/mojo/interfaces/jpeg_decode_accelerator_mojom_traits.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/mojo/interfaces/jpeg_decode_accelerator_typemap_traits.h"
+#include "media/mojo/interfaces/jpeg_decode_accelerator_mojom_traits.h"
 
 #include "base/logging.h"
 #include "media/base/ipc/media_param_traits_macros.h"

media/mojo/interfaces/jpeg_decode_accelerator_typemap_traits.h → media/mojo/interfaces/jpeg_decode_accelerator_mojom_traits.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_MOJO_INTERFACES_JPEG_DECODE_ACCELERATOR_TYPEMAP_TRAITS_H_
-#define MEDIA_MOJO_INTERFACES_JPEG_DECODE_ACCELERATOR_TYPEMAP_TRAITS_H_
+#ifndef MEDIA_MOJO_INTERFACES_JPEG_DECODE_ACCELERATOR_MOJOM_TRAITS_H_
+#define MEDIA_MOJO_INTERFACES_JPEG_DECODE_ACCELERATOR_MOJOM_TRAITS_H_
 
 #include "base/numerics/safe_conversions.h"
 #include "media/base/bitstream_buffer.h"
@@ -61,4 +61,4 @@ struct StructTraits<media::mojom::BitstreamBufferDataView,
 
 }  // namespace mojo
 
-#endif  // MEDIA_MOJO_INTERFACES_JPEG_DECODE_ACCELERATOR_TYPEMAP_TRAITS_H_
+#endif  // MEDIA_MOJO_INTERFACES_JPEG_DECODE_ACCELERATOR_MOJOM_TRAITS_H_

media/mojo/interfaces/jpeg_encode_accelerator.typemap

@@ -7,10 +7,10 @@ mojom = "//media/mojo/interfaces/jpeg_encode_accelerator.mojom"
 public_headers = [ "//media/video/jpeg_encode_accelerator.h" ]
 
 traits_headers =
-    [ "//media/mojo/interfaces/jpeg_encode_accelerator_typemap_traits.h" ]
+    [ "//media/mojo/interfaces/jpeg_encode_accelerator_mojom_traits.h" ]
 
 sources = [
-  "//media/mojo/interfaces/jpeg_encode_accelerator_typemap_traits.cc",
+  "//media/mojo/interfaces/jpeg_encode_accelerator_mojom_traits.cc",
 ]
 
 deps = [

media/mojo/interfaces/jpeg_encode_accelerator_typemap_traits.cc → media/mojo/interfaces/jpeg_encode_accelerator_mojom_traits.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/mojo/interfaces/jpeg_encode_accelerator_typemap_traits.h"
+#include "media/mojo/interfaces/jpeg_encode_accelerator_mojom_traits.h"
 
 #include "base/logging.h"
 

media/mojo/interfaces/jpeg_encode_accelerator_typemap_traits.h → media/mojo/interfaces/jpeg_encode_accelerator_mojom_traits.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_MOJO_INTERFACES_JPEG_ENCODE_ACCELERATOR_TYPEMAP_TRAITS_H_
-#define MEDIA_MOJO_INTERFACES_JPEG_ENCODE_ACCELERATOR_TYPEMAP_TRAITS_H_
+#ifndef MEDIA_MOJO_INTERFACES_JPEG_ENCODE_ACCELERATOR_MOJOM_TRAITS_H_
+#define MEDIA_MOJO_INTERFACES_JPEG_ENCODE_ACCELERATOR_MOJOM_TRAITS_H_
 
 #include "media/mojo/interfaces/jpeg_encode_accelerator.mojom.h"
 #include "media/video/jpeg_encode_accelerator.h"
@@ -22,4 +22,4 @@ struct EnumTraits<media::mojom::EncodeStatus,
 
 }  // namespace mojo
 
-#endif  // MEDIA_MOJO_INTERFACES_JPEG_ENCODE_ACCELERATOR_TYPEMAP_TRAITS_H_
+#endif  // MEDIA_MOJO_INTERFACES_JPEG_ENCODE_ACCELERATOR_MOJOM_TRAITS_H_

media/mojo/interfaces/video_encode_accelerator.typemap

@@ -7,11 +7,11 @@ mojom = "//media/mojo/interfaces/video_encode_accelerator.mojom"
 public_headers = [ "//media/video/video_encode_accelerator.h" ]
 
 traits_headers =
-    [ "//media/mojo/interfaces/video_encode_accelerator_typemap_traits.h" ]
+    [ "//media/mojo/interfaces/video_encode_accelerator_mojom_traits.h" ]
 
 sources = [
-  "//media/mojo/interfaces/video_encode_accelerator_typemap_traits.cc",
-  "//media/mojo/interfaces/video_encode_accelerator_typemap_traits.h",
+  "//media/mojo/interfaces/video_encode_accelerator_mojom_traits.cc",
+  "//media/mojo/interfaces/video_encode_accelerator_mojom_traits.h",
 ]
 
 public_deps = [

media/mojo/interfaces/video_encode_accelerator_typemap_traits.cc → media/mojo/interfaces/video_encode_accelerator_mojom_traits.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/mojo/interfaces/video_encode_accelerator_typemap_traits.h"
+#include "media/mojo/interfaces/video_encode_accelerator_mojom_traits.h"
 
 #include "base/logging.h"
 #include "base/optional.h"

media/mojo/interfaces/video_encode_accelerator_typemap_traits.h → media/mojo/interfaces/video_encode_accelerator_mojom_traits.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_MOJO_INTERFACES_VIDEO_ENCODE_ACCELERATOR_TYPEMAP_TRAITS_H_
-#define MEDIA_MOJO_INTERFACES_VIDEO_ENCODE_ACCELERATOR_TYPEMAP_TRAITS_H_
+#ifndef MEDIA_MOJO_INTERFACES_VIDEO_ENCODE_ACCELERATOR_MOJOM_TRAITS_H_
+#define MEDIA_MOJO_INTERFACES_VIDEO_ENCODE_ACCELERATOR_MOJOM_TRAITS_H_
 
 #include "media/base/ipc/media_param_traits.h"
 #include "media/mojo/interfaces/media_types.mojom.h"
@@ -114,4 +114,4 @@ struct StructTraits<media::mojom::VideoEncodeAcceleratorConfigDataView,
 
 }  // namespace mojo
 
-#endif  // MEDIA_MOJO_INTERFACES_VIDEO_ENCODE_ACCELERATOR_TYPEMAP_TRAITS_H_
+#endif  // MEDIA_MOJO_INTERFACES_VIDEO_ENCODE_ACCELERATOR_MOJOM_TRAITS_H_