Rename mojo directory in //fuchsia
This CL renames mojo to mojom in //fuchsia for consistency
with the rest of the chromium.
fuchsia/mojo => fuchsia/mojom
Bug: 806965
Change-Id: I1f36512ddb418a5a644c546f88fc51ca47cf1a67
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1722168
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
Commit-Queue: Miyoung Shin <myid.shin@igalia.com>
Cr-Commit-Position: refs/heads/master@{#683451}
diff --git a/fuchsia/BUILD.gn b/fuchsia/BUILD.gn
index 07bc5b6..56841a8 100644
--- a/fuchsia/BUILD.gn
+++ b/fuchsia/BUILD.gn
@@ -101,7 +101,7 @@
"engine:web_engine_browsertests",
"engine:web_engine_unittests",
"http:http_service_tests",
- "mojo:fuchsia_mojo_unittests",
+ "mojom:fuchsia_mojo_unittests",
"runners:cast_runner",
"runners:cast_runner_browsertests",
"runners:cast_runner_integration_tests",
diff --git a/fuchsia/mojo/BUILD.gn b/fuchsia/mojom/BUILD.gn
similarity index 100%
rename from fuchsia/mojo/BUILD.gn
rename to fuchsia/mojom/BUILD.gn
diff --git a/fuchsia/mojo/DEPS b/fuchsia/mojom/DEPS
similarity index 100%
rename from fuchsia/mojo/DEPS
rename to fuchsia/mojom/DEPS
diff --git a/fuchsia/mojo/OWNERS b/fuchsia/mojom/OWNERS
similarity index 100%
rename from fuchsia/mojo/OWNERS
rename to fuchsia/mojom/OWNERS
diff --git a/fuchsia/mojo/example.mojom b/fuchsia/mojom/example.mojom
similarity index 100%
rename from fuchsia/mojo/example.mojom
rename to fuchsia/mojom/example.mojom
diff --git a/fuchsia/mojo/example.typemap b/fuchsia/mojom/example.typemap
similarity index 68%
rename from fuchsia/mojo/example.typemap
rename to fuchsia/mojom/example.typemap
index b1d1512..6795be5 100644
--- a/fuchsia/mojo/example.typemap
+++ b/fuchsia/mojom/example.typemap
@@ -2,15 +2,15 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//fuchsia/mojo/example.mojom"
+mojom = "//fuchsia/mojom/example.mojom"
os_whitelist = [ "fuchsia" ]
public_headers = [ "base/fuchsia/testfidl/cpp/fidl.h" ]
-traits_headers = [ "//fuchsia/mojo/test_interface_request_mojom_traits.h" ]
+traits_headers = [ "//fuchsia/mojom/test_interface_request_mojom_traits.h" ]
sources = [
- "//fuchsia/mojo/test_interface_request_mojom_traits.h",
+ "//fuchsia/mojom/test_interface_request_mojom_traits.h",
]
public_deps = [
"//base:testfidl",
- "//fuchsia/mojo:traits",
+ "//fuchsia/mojom:traits",
]
type_mappings = [ "fuchsia.test.mojom.TestInterfaceRequest=fidl::InterfaceRequest<base::fuchsia::testfidl::TestInterface>[move_only]" ]
diff --git a/fuchsia/mojo/fidl_interface_request_mojom_traits.h b/fuchsia/mojom/fidl_interface_request_mojom_traits.h
similarity index 87%
rename from fuchsia/mojo/fidl_interface_request_mojom_traits.h
rename to fuchsia/mojom/fidl_interface_request_mojom_traits.h
index 2c38438..d40f3699 100644
--- a/fuchsia/mojo/fidl_interface_request_mojom_traits.h
+++ b/fuchsia/mojom/fidl_interface_request_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 FUCHSIA_MOJO_FIDL_INTERFACE_REQUEST_MOJOM_TRAITS_H_
-#define FUCHSIA_MOJO_FIDL_INTERFACE_REQUEST_MOJOM_TRAITS_H_
+#ifndef FUCHSIA_MOJOM_FIDL_INTERFACE_REQUEST_MOJOM_TRAITS_H_
+#define FUCHSIA_MOJOM_FIDL_INTERFACE_REQUEST_MOJOM_TRAITS_H_
#include <lib/fidl/cpp/interface_request.h>
@@ -40,4 +40,4 @@
} // namespace mojo
-#endif // FUCHSIA_MOJO_FIDL_INTERFACE_REQUEST_MOJOM_TRAITS_H_
+#endif // FUCHSIA_MOJOM_FIDL_INTERFACE_REQUEST_MOJOM_TRAITS_H_
diff --git a/fuchsia/mojo/fidl_interface_request_mojom_traits_unittest.cc b/fuchsia/mojom/fidl_interface_request_mojom_traits_unittest.cc
similarity index 90%
rename from fuchsia/mojo/fidl_interface_request_mojom_traits_unittest.cc
rename to fuchsia/mojom/fidl_interface_request_mojom_traits_unittest.cc
index 8e34582c..f5ca105 100644
--- a/fuchsia/mojo/fidl_interface_request_mojom_traits_unittest.cc
+++ b/fuchsia/mojom/fidl_interface_request_mojom_traits_unittest.cc
@@ -4,8 +4,8 @@
#include "base/fuchsia/testfidl/cpp/fidl.h"
#include "base/message_loop/message_loop.h"
-#include "fuchsia/mojo/example.mojom.h"
-#include "fuchsia/mojo/test_interface_request_mojom_traits.h"
+#include "fuchsia/mojom/example.mojom.h"
+#include "fuchsia/mojom/test_interface_request_mojom_traits.h"
#include "mojo/public/cpp/test_support/test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/fuchsia/mojo/test_interface_request_mojom_traits.h b/fuchsia/mojom/test_interface_request_mojom_traits.h
similarity index 68%
rename from fuchsia/mojo/test_interface_request_mojom_traits.h
rename to fuchsia/mojom/test_interface_request_mojom_traits.h
index 0f0aeb6..f9be179d 100644
--- a/fuchsia/mojo/test_interface_request_mojom_traits.h
+++ b/fuchsia/mojom/test_interface_request_mojom_traits.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef FUCHSIA_MOJO_TEST_INTERFACE_REQUEST_MOJOM_TRAITS_H_
-#define FUCHSIA_MOJO_TEST_INTERFACE_REQUEST_MOJOM_TRAITS_H_
+#ifndef FUCHSIA_MOJOM_TEST_INTERFACE_REQUEST_MOJOM_TRAITS_H_
+#define FUCHSIA_MOJOM_TEST_INTERFACE_REQUEST_MOJOM_TRAITS_H_
-#include "fuchsia/mojo/fidl_interface_request_mojom_traits.h"
+#include "fuchsia/mojom/fidl_interface_request_mojom_traits.h"
namespace mojo {
@@ -19,4 +19,4 @@
} // namespace mojo
-#endif // FUCHSIA_MOJO_TEST_INTERFACE_REQUEST_MOJOM_TRAITS_H_
+#endif // FUCHSIA_MOJOM_TEST_INTERFACE_REQUEST_MOJOM_TRAITS_H_
diff --git a/fuchsia/mojo/test_typemaps.gni b/fuchsia/mojom/test_typemaps.gni
similarity index 76%
rename from fuchsia/mojo/test_typemaps.gni
rename to fuchsia/mojom/test_typemaps.gni
index 0fb662f..521c8d4 100644
--- a/fuchsia/mojo/test_typemaps.gni
+++ b/fuchsia/mojom/test_typemaps.gni
@@ -2,4 +2,4 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-typemaps = [ "//fuchsia/mojo/example.typemap" ]
+typemaps = [ "//fuchsia/mojom/example.typemap" ]
diff --git a/mojo/public/tools/bindings/chromium_bindings_configuration.gni b/mojo/public/tools/bindings/chromium_bindings_configuration.gni
index 74ae897..1dae886 100644
--- a/mojo/public/tools/bindings/chromium_bindings_configuration.gni
+++ b/mojo/public/tools/bindings/chromium_bindings_configuration.gni
@@ -22,7 +22,7 @@
"//device/bluetooth/public/mojom/typemaps.gni",
"//device/bluetooth/public/mojom/test/typemaps.gni",
"//device/gamepad/public/cpp/typemaps.gni",
- "//fuchsia/mojo/test_typemaps.gni",
+ "//fuchsia/mojom/test_typemaps.gni",
"//gpu/ipc/common/typemaps.gni",
"//ipc/typemaps.gni",
"//media/capture/mojom/typemaps.gni",
