Rename traits in //content

This CL renames *_struct_traits.* to *_mojom_traits.* in //content.

*_struct_traits.* => *_mojom_traits.*

Bug: 806965
Change-Id: I64e94630bdf74821ab454af05240082715a916f1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1728529Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Miyoung Shin <myid.shin@igalia.com>
Cr-Commit-Position: refs/heads/master@{#683169}

content/common/BUILD.gn

@@ -140,8 +140,8 @@ source_set("common") {
     "input/input_event_dispatch_type.h",
     "input/input_event_stream_validator.cc",
     "input/input_event_stream_validator.h",
-    "input/input_event_struct_traits.cc",
-    "input/input_event_struct_traits.h",
+    "input/input_event_mojom_traits.cc",
+    "input/input_event_mojom_traits.h",
     "input/input_param_traits.cc",
     "input/input_param_traits.h",
     "input/sync_compositor_messages.cc",
@@ -162,8 +162,8 @@ source_set("common") {
     "input/synthetic_tap_gesture_params.h",
     "input/synthetic_web_input_event_builders.cc",
     "input/synthetic_web_input_event_builders.h",
-    "input/touch_action_optional_struct_traits.cc",
-    "input/touch_action_optional_struct_traits.h",
+    "input/touch_action_optional_mojom_traits.cc",
+    "input/touch_action_optional_mojom_traits.h",
     "input/touch_event_stream_validator.cc",
     "input/touch_event_stream_validator.h",
     "input/web_mouse_wheel_event_traits.cc",

content/common/OWNERS

@@ -28,8 +28,8 @@ per-file *.typemap=file://ipc/SECURITY_OWNERS
 per-file *_param_traits*.*=set noparent
 per-file *_param_traits*.*=file://ipc/SECURITY_OWNERS
 
-per-file *_struct_traits*.*=set noparent
-per-file *_struct_traits*.*=file://ipc/SECURITY_OWNERS
+per-file *_mojom_traits*.*=set noparent
+per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS
 
 per-file *font_config_ipc_linux*=set noparent
 per-file *font_config_ipc_linux*=file://ipc/SECURITY_OWNERS

content/common/background_fetch/OWNERS

 file://content/browser/background_fetch/OWNERS
 
-per-file *_struct_traits*.*=set noparent
-per-file *_struct_traits*.*=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

content/common/input/OWNERS

@@ -6,8 +6,8 @@ per-file *.mojom=set noparent
 per-file *.mojom=file://ipc/SECURITY_OWNERS
 per-file *_param_traits*.*=set noparent
 per-file *_param_traits*.*=file://ipc/SECURITY_OWNERS
-per-file *_struct_traits*.*=set noparent
-per-file *_struct_traits*.*=file://ipc/SECURITY_OWNERS
+per-file *_mojom_traits*.*=set noparent
+per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS
 per-file *_messages.cc=set noparent
 per-file *_messages.cc=file://ipc/SECURITY_OWNERS
 per-file *_messages*.h=set noparent

content/common/input/input_event_struct_traits.cc → content/common/input/input_event_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/input/input_event_struct_traits.h"
+#include "content/common/input/input_event_mojom_traits.h"
 
 #include "base/i18n/char_iterator.h"
 #include "content/common/input_messages.h"

content/common/input/input_event_struct_traits.h → content/common/input/input_event_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_INPUT_INPUT_EVENT_STRUCT_TRAITS_H_
-#define CONTENT_COMMON_INPUT_INPUT_EVENT_STRUCT_TRAITS_H_
+#ifndef CONTENT_COMMON_INPUT_INPUT_EVENT_MOJOM_TRAITS_H_
+#define CONTENT_COMMON_INPUT_INPUT_EVENT_MOJOM_TRAITS_H_
 
 #include "content/common/input/input_handler.mojom.h"
 
@@ -46,4 +46,4 @@ struct StructTraits<content::mojom::EventDataView, InputEventUniquePtr> {
 
 }  // namespace mojo
 
-#endif  // CONTENT_COMMON_INPUT_INPUT_EVENT_STRUCT_TRAITS_H_
+#endif  // CONTENT_COMMON_INPUT_INPUT_EVENT_MOJOM_TRAITS_H_

content/common/input/touch_action_optional_struct_traits.cc → content/common/input/touch_action_optional_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/input/touch_action_optional_struct_traits.h"
+#include "content/common/input/touch_action_optional_mojom_traits.h"
 
 #include "content/public/common/common_param_traits_macros.h"
 

content/common/input/touch_action_optional_struct_traits.h → content/common/input/touch_action_optional_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_INPUT_TOUCH_ACTION_OPTIONAL_STRUCT_TRAITS_H_
-#define CONTENT_COMMON_INPUT_TOUCH_ACTION_OPTIONAL_STRUCT_TRAITS_H_
+#ifndef CONTENT_COMMON_INPUT_TOUCH_ACTION_OPTIONAL_MOJOM_TRAITS_H_
+#define CONTENT_COMMON_INPUT_TOUCH_ACTION_OPTIONAL_MOJOM_TRAITS_H_
 
 #include "base/optional.h"
 #include "content/common/input/input_handler.mojom.h"
@@ -20,4 +20,4 @@ struct StructTraits<content::mojom::TouchActionOptionalDataView,
 
 }  // namespace mojo
 
-#endif  // CONTENT_COMMON_INPUT_TOUCH_ACTION_OPTIONAL_STRUCT_TRAITS_H_
+#endif  // CONTENT_COMMON_INPUT_TOUCH_ACTION_OPTIONAL_MOJOM_TRAITS_H_

content/common/media/OWNERS

@@ -13,9 +13,6 @@ per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS
 per-file *_param_traits*.*=set noparent
 per-file *_param_traits*.*=file://ipc/SECURITY_OWNERS
 
-per-file *_struct_traits*.*=set noparent
-per-file *_struct_traits*.*=file://ipc/SECURITY_OWNERS
-
 per-file *.typemap=set noparent
 per-file *.typemap=file://ipc/SECURITY_OWNERS
 

content/common/native_types.typemap

@@ -33,8 +33,8 @@ public_headers = [
 traits_headers = [
   "//content/common/frame_messages.h",
   "//content/common/input_messages.h",
-  "//content/common/input/input_event_struct_traits.h",
-  "//content/common/input/touch_action_optional_struct_traits.h",
+  "//content/common/input/input_event_mojom_traits.h",
+  "//content/common/input/touch_action_optional_mojom_traits.h",
   "//content/common/view_messages.h",
   "//content/common/widget_messages.h",
   "//content/public/common/common_param_traits.h",

content/common/render_frame_metadata.typemap

@@ -4,12 +4,12 @@
 
 mojom = "//content/common/render_frame_metadata.mojom"
 public_headers = [ "//cc/trees/render_frame_metadata.h" ]
-traits_headers = [ "//content/common/render_frame_metadata_struct_traits.h" ]
+traits_headers = [ "//content/common/render_frame_metadata_mojom_traits.h" ]
 deps = [
   "//cc",
   "//ui/gfx/geometry/mojom:mojom_traits",
 ]
 sources = [
-  "//content/common/render_frame_metadata_struct_traits.cc",
+  "//content/common/render_frame_metadata_mojom_traits.cc",
 ]
 type_mappings = [ "content.mojom.RenderFrameMetadata=cc::RenderFrameMetadata" ]

content/common/render_frame_metadata_struct_traits.cc → content/common/render_frame_metadata_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/render_frame_metadata_struct_traits.h"
+#include "content/common/render_frame_metadata_mojom_traits.h"
 
 #include "build/build_config.h"
 #include "mojo/public/cpp/base/time_mojom_traits.h"

content/common/render_frame_metadata_struct_traits.h → content/common/render_frame_metadata_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_RENDER_FRAME_METADATA_STRUCT_TRAITS_H_
-#define CONTENT_COMMON_RENDER_FRAME_METADATA_STRUCT_TRAITS_H_
+#ifndef CONTENT_COMMON_RENDER_FRAME_METADATA_MOJOM_TRAITS_H_
+#define CONTENT_COMMON_RENDER_FRAME_METADATA_MOJOM_TRAITS_H_
 
 #include "base/optional.h"
 #include "base/time/time.h"
@@ -116,4 +116,4 @@ struct StructTraits<content::mojom::RenderFrameMetadataDataView,
 
 }  // namespace mojo
 
-#endif  // CONTENT_COMMON_RENDER_FRAME_METADATA_STRUCT_TRAITS_H_
+#endif  // CONTENT_COMMON_RENDER_FRAME_METADATA_MOJOM_TRAITS_H_

content/common/service_worker/OWNERS

@@ -6,9 +6,6 @@ per-file *_messages*.h=file://ipc/SECURITY_OWNERS
 per-file *.mojom=set noparent
 per-file *.mojom=file://ipc/SECURITY_OWNERS
 
-per-file *_struct_traits*.*=set noparent
-per-file *_struct_traits*.*=file://ipc/SECURITY_OWNERS
-
 per-file *_mojom_traits*.*=set noparent
 per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS
 

content/public/common/OWNERS

@@ -6,8 +6,8 @@ per-file network*=file://services/network/OWNERS
 
 per-file *.mojom=set noparent
 per-file *.mojom=file://ipc/SECURITY_OWNERS
-per-file *_struct_traits*.*=set noparent
-per-file *_struct_traits*.*=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
 per-file *_type_converter*.*=set noparent

content/public/common/load_timing_info.typemap

@@ -4,9 +4,9 @@
 
 mojom = "//content/public/common/load_timing_info.mojom"
 public_headers = [ "//net/base/load_timing_info.h" ]
-traits_headers = [ "//content/public/common/load_timing_info_struct_traits.h" ]
+traits_headers = [ "//content/public/common/load_timing_info_mojom_traits.h" ]
 sources = [
-  "//content/public/common/load_timing_info_struct_traits.cc",
+  "//content/public/common/load_timing_info_mojom_traits.cc",
 ]
 type_mappings = [
   "content.mojom.LoadTimingInfo=net::LoadTimingInfo",

content/public/common/load_timing_info_struct_traits.cc → content/public/common/load_timing_info_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/public/common/load_timing_info_struct_traits.h"
+#include "content/public/common/load_timing_info_mojom_traits.h"
 
 #include "mojo/public/cpp/base/time_mojom_traits.h"
 

content/public/common/load_timing_info_struct_traits.h → content/public/common/load_timing_info_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_PUBLIC_COMMON_LOAD_TIMING_INFO_STRUCT_TRAITS_H_
-#define CONTENT_PUBLIC_COMMON_LOAD_TIMING_INFO_STRUCT_TRAITS_H_
+#ifndef CONTENT_PUBLIC_COMMON_LOAD_TIMING_INFO_MOJOM_TRAITS_H_
+#define CONTENT_PUBLIC_COMMON_LOAD_TIMING_INFO_MOJOM_TRAITS_H_
 
 #include "content/public/common/load_timing_info.mojom.h"
 #include "mojo/public/cpp/bindings/struct_traits.h"
@@ -110,4 +110,4 @@ struct StructTraits<content::mojom::LoadTimingInfoDataView,
 
 }  // namespace mojo
 
-#endif  // CONTENT_PUBLIC_COMMON_LOAD_TIMING_INFO_STRUCT_TRAITS_H_
+#endif  // CONTENT_PUBLIC_COMMON_LOAD_TIMING_INFO_MOJOM_TRAITS_H_

content/public/common/resource_type.typemap

@@ -4,9 +4,9 @@
 
 mojom = "//content/public/common/resource_type.mojom"
 public_headers = [ "//content/public/common/resource_type.h" ]
-traits_headers = [ "//content/public/common/resource_type_struct_traits.h" ]
+traits_headers = [ "//content/public/common/resource_type_mojom_traits.h" ]
 sources = [
-  "//content/public/common/resource_type_struct_traits.cc",
+  "//content/public/common/resource_type_mojom_traits.cc",
 ]
 public_deps = [
   "//content/public/common:resource_type_header",

content/public/common/resource_type_struct_traits.cc → content/public/common/resource_type_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/public/common/resource_type_struct_traits.h"
+#include "content/public/common/resource_type_mojom_traits.h"
 
 namespace mojo {
 

content/public/common/resource_type_struct_traits.h → content/public/common/resource_type_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_PUBLIC_COMMON_RESOURCE_TYPE_ENUM_TRAITS_H_
-#define CONTENT_PUBLIC_COMMON_RESOURCE_TYPE_ENUM_TRAITS_H_
+#ifndef CONTENT_PUBLIC_COMMON_RESOURCE_TYPE_MOJOM_TRAITS_H_
+#define CONTENT_PUBLIC_COMMON_RESOURCE_TYPE_MOJOM_TRAITS_H_
 
 #include "content/public/common/resource_type.h"
 #include "content/public/common/resource_type.mojom-shared.h"
@@ -19,4 +19,4 @@ struct EnumTraits<content::mojom::ResourceType, content::ResourceType> {
 };
 }  // namespace mojo
 
-#endif  // CONTENT_PUBLIC_COMMON_RESOURCE_TYPE_ENUM_TRAITS_H_
+#endif  // CONTENT_PUBLIC_COMMON_RESOURCE_TYPE_MOJOM_TRAITS_H_

content/test/BUILD.gn

@@ -1839,7 +1839,7 @@ test("content_unittests") {
     "../child/dwrite_font_proxy/font_fallback_win_unittest.cc",
     "../child/font_warmup_win_unittest.cc",
     "../common/android/gin_java_bridge_value_unittest.cc",
-    "../common/background_fetch/background_fetch_struct_traits_unittest.cc",
+    "../common/background_fetch/background_fetch_mojom_traits_unittest.cc",
     "../common/common_param_traits_unittest.cc",
     "../common/content_security_policy/content_security_policy_unittest.cc",
     "../common/content_security_policy/csp_context_unittest.cc",