Rename traits and mojo directory in //components/chrome_cleaner
This change renames interfaces to mojom and *_struct_traits.*
to *_mojom_traits.* in //ui/components/chrome_cleaner.
*_struct_traits.* => *_mojom_traits.*
//components/chrome_cleaner/public/interfaces => //components/chrome_cleaner/public/mojom
Bug: 806965
Change-Id: I2577215b92c6cae50ea5c36e0d886cc74045777c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1699778
Reviewed-by: Ken Rockot <rockot@google.com>
Reviewed-by: Joe Mason <joenotcharles@google.com>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Miyoung Shin <myid.shin@igalia.com>
Cr-Original-Commit-Position: refs/heads/master@{#677623}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: c4c71cc414af0dc8fd33b50c27324461203dc2bb
diff --git a/public/interfaces/BUILD.gn b/public/mojom/BUILD.gn
similarity index 94%
rename from public/interfaces/BUILD.gn
rename to public/mojom/BUILD.gn
index 082d9b3..a24f87a 100644
--- a/public/interfaces/BUILD.gn
+++ b/public/mojom/BUILD.gn
@@ -4,7 +4,7 @@
import("//mojo/public/tools/bindings/mojom.gni")
-mojom("interfaces") {
+mojom("mojom") {
sources = [
"chrome_prompt.mojom",
]
diff --git a/public/interfaces/OWNERS b/public/mojom/OWNERS
similarity index 100%
rename from public/interfaces/OWNERS
rename to public/mojom/OWNERS
diff --git a/public/interfaces/chrome_prompt.mojom b/public/mojom/chrome_prompt.mojom
similarity index 100%
rename from public/interfaces/chrome_prompt.mojom
rename to public/mojom/chrome_prompt.mojom
diff --git a/public/typemaps/OWNERS b/public/typemaps/OWNERS
index adcd752..03fa9a5 100644
--- a/public/typemaps/OWNERS
+++ b/public/typemaps/OWNERS
@@ -1,7 +1,7 @@
set noparent
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
diff --git a/public/typemaps/chrome_prompt.typemap b/public/typemaps/chrome_prompt.typemap
index 079592c..0f34119 100644
--- a/public/typemaps/chrome_prompt.typemap
+++ b/public/typemaps/chrome_prompt.typemap
@@ -2,16 +2,16 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//components/chrome_cleaner/public/interfaces/chrome_prompt.mojom"
+mojom = "//components/chrome_cleaner/public/mojom/chrome_prompt.mojom"
public_headers = [
"//base/files/file_path.h",
"//base/strings/string16.h",
]
traits_headers = [
- "//components/chrome_cleaner/public/typemaps/chrome_prompt_struct_traits.h",
+ "//components/chrome_cleaner/public/typemaps/chrome_prompt_mojom_traits.h",
]
sources = [
- "//components/chrome_cleaner/public/typemaps/chrome_prompt_struct_traits.cc",
+ "//components/chrome_cleaner/public/typemaps/chrome_prompt_mojom_traits.cc",
]
type_mappings = [
diff --git a/public/typemaps/chrome_prompt_struct_traits.cc b/public/typemaps/chrome_prompt_mojom_traits.cc
similarity index 99%
rename from public/typemaps/chrome_prompt_struct_traits.cc
rename to public/typemaps/chrome_prompt_mojom_traits.cc
index e4b6412..a55242c 100644
--- a/public/typemaps/chrome_prompt_struct_traits.cc
+++ b/public/typemaps/chrome_prompt_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 "components/chrome_cleaner/public/typemaps/chrome_prompt_struct_traits.h"
+#include "components/chrome_cleaner/public/typemaps/chrome_prompt_mojom_traits.h"
#include "build/build_config.h"
namespace mojo {
diff --git a/public/typemaps/chrome_prompt_struct_traits.h b/public/typemaps/chrome_prompt_mojom_traits.h
similarity index 78%
rename from public/typemaps/chrome_prompt_struct_traits.h
rename to public/typemaps/chrome_prompt_mojom_traits.h
index 7f9f6e0..e208be5 100644
--- a/public/typemaps/chrome_prompt_struct_traits.h
+++ b/public/typemaps/chrome_prompt_mojom_traits.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef COMPONENTS_CHROME_CLEANER_PUBLIC_TYPEMAPS_CHROME_CLEANER_STRUCT_TRAITS_H_
-#define COMPONENTS_CHROME_CLEANER_PUBLIC_TYPEMAPS_CHROME_CLEANER_STRUCT_TRAITS_H_
+#ifndef COMPONENTS_CHROME_CLEANER_PUBLIC_TYPEMAPS_CHROME_PROMPT_MOJOM_TRAITS_H_
+#define COMPONENTS_CHROME_CLEANER_PUBLIC_TYPEMAPS_CHROME_PROMPT_MOJOM_TRAITS_H_
#include "base/containers/span.h"
#include "base/files/file_path.h"
#include "base/strings/string16.h"
-#include "components/chrome_cleaner/public/interfaces/chrome_prompt.mojom.h"
+#include "components/chrome_cleaner/public/mojom/chrome_prompt.mojom.h"
namespace mojo {
@@ -37,4 +37,4 @@
} // namespace mojo
-#endif // COMPONENTS_CHROME_CLEANER_PUBLIC_TYPEMAPS_CHROME_CLEANER_STRUCT_TRAITS_H_
+#endif // COMPONENTS_CHROME_CLEANER_PUBLIC_TYPEMAPS_CHROME_PROMPT_MOJOM_TRAITS_H_
