Rename traits in //services

This CL renames *_struct_traits.* to *_mojom_traits.* in
//services and fixes the wrong header guard name.

*_struct_traits.* => *_mojom_traits.*

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

services/media_session/public/cpp/BUILD.gn

@@ -71,7 +71,7 @@ source_set("tests") {
   sources = [
     "media_image_manager_unittest.cc",
     "media_position_unittest.cc",
-    "struct_traits_unittest.cc",
+    "mojom_traits_unittest.cc",
   ]
 
   deps = [

services/proxy_resolver/public/cpp/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
 per-file *.typemap=file://ipc/SECURITY_OWNERS
 per-file manifest.cc=set noparent

services/proxy_resolver/public/cpp/mojo_host_struct_traits.cc → services/proxy_resolver/public/cpp/mojo_host_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 "services/proxy_resolver/public/cpp/mojo_host_struct_traits.h"
+#include "services/proxy_resolver/public/cpp/mojo_host_mojom_traits.h"
 
 #include <utility>
 

services/proxy_resolver/public/cpp/mojo_host_struct_traits.h → services/proxy_resolver/public/cpp/mojo_host_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 SERVICES_PROXY_RESOLVER_PUBLIC_CPP_MOJO_HOST_STRUCT_TRAITS_H_
-#define SERVICES_PROXY_RESOLVER_PUBLIC_CPP_MOJO_HOST_STRUCT_TRAITS_H_
+#ifndef SERVICES_PROXY_RESOLVER_PUBLIC_CPP_MOJO_HOST_MOJOM_TRAITS_H_
+#define SERVICES_PROXY_RESOLVER_PUBLIC_CPP_MOJO_HOST_MOJOM_TRAITS_H_
 
 #include "base/strings/string_piece.h"
 #include "mojo/public/cpp/bindings/enum_traits.h"
@@ -24,4 +24,4 @@ struct EnumTraits<proxy_resolver::mojom::HostResolveOperation,
 
 }  // namespace mojo
 
-#endif  // SERVICES_PROXY_RESOLVER_PUBLIC_CPP_MOJO_HOST_STRUCT_TRAITS_H_
+#endif  // SERVICES_PROXY_RESOLVER_PUBLIC_CPP_MOJO_HOST_MOJOM_TRAITS_H_

services/proxy_resolver/public/cpp/proxy_resolver.typemap

@@ -9,11 +9,11 @@ public_headers = [
   "//net/proxy_resolution/proxy_resolve_dns_operation.h",
 ]
 traits_headers = [
-  "//services/proxy_resolver/public/cpp/mojo_host_struct_traits.h",
+  "//services/proxy_resolver/public/cpp/mojo_host_mojom_traits.h",
   "//services/proxy_resolver/public/cpp/proxy_resolver_mojom_traits.h",
 ]
 sources = [
-  "//services/proxy_resolver/public/cpp/mojo_host_struct_traits.cc",
+  "//services/proxy_resolver/public/cpp/mojo_host_mojom_traits.cc",
   "//services/proxy_resolver/public/cpp/proxy_resolver_mojom_traits.cc",
 ]
 type_mappings = [

services/service_manager/public/cpp/bind_source_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 SERVICES_SERVICE_MANAGER_PUBLIC_CPP_BIND_SOURCE_INFO_STRUCT_TRAITS_H_
-#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_BIND_SOURCE_INFO_STRUCT_TRAITS_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_BIND_SOURCE_INFO_MOJOM_TRAITS_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_BIND_SOURCE_INFO_MOJOM_TRAITS_H_
 
 #include "services/service_manager/public/cpp/bind_source_info.h"
 #include "services/service_manager/public/mojom/service.mojom.h"
@@ -31,4 +31,4 @@ struct COMPONENT_EXPORT(SERVICE_MANAGER_MOJOM)
 
 }  // namespace mojo
 
-#endif  // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_BIND_SOURCE_INFO_STRUCT_TRAITS_H_
+#endif  // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_BIND_SOURCE_INFO_MOJOM_TRAITS_H_

services/service_manager/public/cpp/identity_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 SERVICES_SERVICE_MANAGER_PUBLIC_CPP_IDENTITY_STRUCT_TRAITS_H_
-#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_IDENTITY_STRUCT_TRAITS_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_IDENTITY_MOJOM_TRAITS_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_IDENTITY_MOJOM_TRAITS_H_
 
 #include "base/component_export.h"
 #include "services/service_manager/public/cpp/identity.h"
@@ -38,4 +38,4 @@ struct COMPONENT_EXPORT(SERVICE_MANAGER_MOJOM_TRAITS)
 
 }  // namespace mojo
 
-#endif  // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_IDENTITY_STRUCT_TRAITS_H_
+#endif  // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_IDENTITY_MOJOM_TRAITS_H_

services/service_manager/public/cpp/interface_provider_spec_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 SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_PROVIDER_SPEC_STRUCT_TRAITS_H_
-#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_PROVIDER_SPEC_STRUCT_TRAITS_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_PROVIDER_SPEC_MOJOM_TRAITS_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_PROVIDER_SPEC_MOJOM_TRAITS_H_
 
 #include "services/service_manager/public/cpp/interface_provider_spec.h"
 #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h"
@@ -82,4 +82,4 @@ struct COMPONENT_EXPORT(SERVICE_MANAGER_MOJOM)
 
 }  // namespace mojo
 
-#endif  // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_PROVIDER_SPEC_STRUCT_TRAITS_H_
+#endif  // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_PROVIDER_SPEC_MOJOM_TRAITS_H_

services/video_capture/public/mojom/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