Rename traits and mojo directory in //ui/latency

This CL renames mojo to mojom and *_struct_traits.* to *_mojom_traits.* in //ui/latency. *_struct_traits.* => *_mojom_traits.* ui/latency/mojo => ui/latency/mojom Bug: 806965 Change-Id: I04aa7f37f5f671a77bcb072ed79a0508b7b4a982 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1716041 Commit-Queue: Miyoung Shin <[email protected]> Reviewed-by: Sadrul Chowdhury <[email protected]> Reviewed-by: Kinuko Yasuda <[email protected]> Reviewed-by: Ken Rockot <[email protected]> Cr-Commit-Position: refs/heads/master@{#681615}
Thompson-NO3 · Jul 27, 2019 · 74dd879 · 74dd879
1 parent 9edd61b
commit 74dd879
Show file tree

Hide file tree

Showing 30 changed files with 39 additions and 39 deletions.
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
@@ -527,7 +527,7 @@ mojom("mojo_bindings") {
     "//ui/gfx/image/mojo:interfaces",
     "//ui/gfx/mojo",
     "//ui/gfx/range/mojo",
-    "//ui/latency/mojo:interfaces",
+    "//ui/latency/mojom",
     "//url/mojom:url_mojom_gurl",
     "//url/mojom:url_mojom_origin",
   ]

diff --git a/content/common/input/input_event_struct_traits.cc b/content/common/input/input_event_struct_traits.cc
@@ -9,7 +9,7 @@
 #include "mojo/public/cpp/base/time_mojom_traits.h"
 #include "third_party/blink/public/platform/web_keyboard_event.h"
 #include "third_party/blink/public/platform/web_mouse_wheel_event.h"
-#include "ui/latency/mojo/latency_info_struct_traits.h"
+#include "ui/latency/mojom/latency_info_mojom_traits.h"
 
 namespace mojo {
 namespace {

diff --git a/content/common/input/input_handler.mojom b/content/common/input/input_handler.mojom
@@ -14,7 +14,7 @@ import "ui/events/mojom/event.mojom";
 import "ui/events/mojom/event_constants.mojom";
 import "ui/gfx/geometry/mojom/geometry.mojom";
 import "ui/gfx/range/mojo/range.mojom";
-import "ui/latency/mojo/latency_info.mojom";
+import "ui/latency/mojom/latency_info.mojom";
 
 
 // These structs are purposely duplicated from ui/events/mojom/event.mojom.

diff --git a/mojo/public/tools/bindings/chromium_bindings_configuration.gni b/mojo/public/tools/bindings/chromium_bindings_configuration.gni
@@ -55,7 +55,7 @@ _typemap_imports = [
   "//ui/display/mojom/typemaps.gni",
   "//ui/events/mojom/typemaps.gni",
   "//ui/gfx/typemaps.gni",
-  "//ui/latency/mojo/typemaps.gni",
+  "//ui/latency/mojom/typemaps.gni",
   "//ui/ozone/public/mojom/typemaps.gni",
   "//url/mojom/typemaps.gni",
 ]

diff --git a/services/viz/privileged/interfaces/compositing/BUILD.gn b/services/viz/privileged/interfaces/compositing/BUILD.gn
@@ -26,7 +26,7 @@ mojom("compositing") {
     "//skia/public/interfaces",
     "//ui/gfx/geometry/mojom",
     "//ui/gfx/mojo",
-    "//ui/latency/mojo:interfaces",
+    "//ui/latency/mojom",
   ]
 
   enabled_features = []

diff --git a/services/viz/privileged/interfaces/compositing/display_private.mojom b/services/viz/privileged/interfaces/compositing/display_private.mojom
@@ -11,7 +11,7 @@ import "ui/gfx/mojo/color_space.mojom";
 import "ui/gfx/mojo/overlay_transform.mojom";
 import "ui/gfx/mojo/transform.mojom";
 import "ui/gfx/geometry/mojom/geometry.mojom";
-import "ui/latency/mojo/latency_info.mojom";
+import "ui/latency/mojom/latency_info.mojom";
 import "services/viz/privileged/interfaces/compositing/layered_window_updater.mojom";
 import "services/viz/privileged/interfaces/compositing/vsync_parameter_observer.mojom";
 

diff --git a/services/viz/public/cpp/compositing/DEPS b/services/viz/public/cpp/compositing/DEPS
@@ -5,6 +5,6 @@ include_rules = [
   "+skia/public/interfaces",
   "+third_party/skia/include",
   "+ui/gfx",
-  "+ui/latency/mojo",
+  "+ui/latency/mojom",
   "+gpu/ipc/common/vulkan_ycbcr_info.h"
 ]
diff --git a/services/viz/public/cpp/compositing/compositor_frame_for_blink.typemap b/services/viz/public/cpp/compositing/compositor_frame_for_blink.typemap
@@ -20,7 +20,7 @@ traits_headers = [
   "//services/viz/public/cpp/compositing/transferable_resource_struct_traits.h",
   "//ui/gfx/mojo/selection_bound_struct_traits.h",
   "//ui/gfx/mojo/transform_struct_traits.h",
-  "//ui/latency/mojo/latency_info_struct_traits.h",
+  "//ui/latency/mojom/latency_info_mojom_traits.h",
 ]
 public_deps = [
   "//components/viz/common",
@@ -29,6 +29,6 @@ public_deps = [
   "//skia/public/interfaces",
   "//ui/gfx/geometry/mojom",
   "//ui/gfx/mojo",
-  "//ui/latency/mojo:interfaces",
+  "//ui/latency/mojom",
 ]
 type_mappings = [ "viz.mojom.CompositorFrame=viz::CompositorFrame[move_only]" ]
diff --git a/services/viz/public/cpp/compositing/compositor_frame_metadata_struct_traits.cc b/services/viz/public/cpp/compositing/compositor_frame_metadata_struct_traits.cc
@@ -9,7 +9,7 @@
 #include "services/viz/public/cpp/compositing/selection_struct_traits.h"
 #include "services/viz/public/cpp/compositing/surface_id_struct_traits.h"
 #include "ui/gfx/mojo/selection_bound_struct_traits.h"
-#include "ui/latency/mojo/latency_info_struct_traits.h"
+#include "ui/latency/mojom/latency_info_mojom_traits.h"
 
 namespace mojo {
 

diff --git a/services/viz/public/cpp/compositing/struct_traits_perftest.cc b/services/viz/public/cpp/compositing/struct_traits_perftest.cc
@@ -22,7 +22,7 @@
 #include "testing/perf/perf_test.h"
 #include "ui/gfx/geometry/mojom/geometry_mojom_traits.h"
 #include "ui/gfx/mojo/selection_bound_struct_traits.h"
-#include "ui/latency/mojo/latency_info_struct_traits.h"
+#include "ui/latency/mojom/latency_info_mojom_traits.h"
 
 namespace viz {
 namespace {

diff --git a/services/viz/public/cpp/compositing/struct_traits_unittest.cc b/services/viz/public/cpp/compositing/struct_traits_unittest.cc
@@ -61,7 +61,7 @@
 #include "ui/gfx/mojo/color_space_mojom_traits.h"
 #include "ui/gfx/mojo/selection_bound_struct_traits.h"
 #include "ui/gfx/mojo/transform_struct_traits.h"
-#include "ui/latency/mojo/latency_info_struct_traits.h"
+#include "ui/latency/mojom/latency_info_mojom_traits.h"
 
 namespace viz {
 

diff --git a/services/viz/public/interfaces/BUILD.gn b/services/viz/public/interfaces/BUILD.gn
@@ -46,7 +46,7 @@ mojom("interfaces") {
     "//skia/public/interfaces",
     "//ui/gfx/geometry/mojom",
     "//ui/gfx/mojo",
-    "//ui/latency/mojo:interfaces",
+    "//ui/latency/mojom",
   ]
 
   if (is_chromeos) {

diff --git a/services/viz/public/interfaces/compositing/compositor_frame_metadata.mojom b/services/viz/public/interfaces/compositing/compositor_frame_metadata.mojom
@@ -10,8 +10,8 @@ import "services/viz/public/interfaces/compositing/frame_deadline.mojom";
 import "services/viz/public/interfaces/compositing/selection.mojom";
 import "services/viz/public/interfaces/compositing/surface_id.mojom";
 import "services/viz/public/interfaces/compositing/surface_range.mojom";
-import "ui/latency/mojo/latency_info.mojom";
 import "ui/gfx/geometry/mojom/geometry.mojom";
+import "ui/latency/mojom/latency_info.mojom";
 
 // See components/viz/service/quads/compositor_frame_metadata.h.
 struct CompositorFrameMetadata {

diff --git a/ui/events/mojom/BUILD.gn b/ui/events/mojom/BUILD.gn
@@ -14,6 +14,6 @@ mojom("mojom") {
   public_deps = [
     "//mojo/public/mojom/base",
     "//ui/gfx/geometry/mojom",
-    "//ui/latency/mojo:interfaces",
+    "//ui/latency/mojom",
   ]
 }
diff --git a/ui/events/mojom/DEPS b/ui/events/mojom/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
   "+mojo/public",
   "+ui/events",
-  "+ui/latency/mojo",
+  "+ui/latency/mojom",
 ]
diff --git a/ui/events/mojom/event.mojom b/ui/events/mojom/event.mojom
@@ -8,7 +8,7 @@ import "mojo/public/mojom/base/time.mojom";
 import "ui/events/mojom/event_constants.mojom";
 import "ui/events/mojom/keyboard_codes.mojom";
 import "ui/gfx/geometry/mojom/geometry.mojom";
-import "ui/latency/mojo/latency_info.mojom";
+import "ui/latency/mojom/latency_info.mojom";
 
 // The values here correspond to the values defined in ui::KeyEvent.
 struct KeyData {

diff --git a/ui/events/mojom/event.typemap b/ui/events/mojom/event.typemap
@@ -9,7 +9,7 @@ public_deps = [
   "//ui/events",
   "//ui/events:dom_keycode_converter",
   "//ui/gfx/geometry/mojom",
-  "//ui/latency/mojo:interfaces",
+  "//ui/latency/mojom",
 ]
 deps = [
   "//ipc:param_traits",

diff --git a/ui/events/mojom/event_mojom_traits.cc b/ui/events/mojom/event_mojom_traits.cc
@@ -11,7 +11,7 @@
 #include "ui/events/keycodes/dom/dom_code.h"
 #include "ui/events/keycodes/dom/keycode_converter.h"
 #include "ui/events/mojom/event_constants.mojom.h"
-#include "ui/latency/mojo/latency_info_struct_traits.h"
+#include "ui/latency/mojom/latency_info_mojom_traits.h"
 
 namespace mojo {
 

diff --git a/ui/events/mojom/mojom_traits_unittest.cc b/ui/events/mojom/mojom_traits_unittest.cc
@@ -13,7 +13,7 @@
 #include "ui/events/mojom/event.mojom.h"
 #include "ui/events/mojom/event_mojom_traits.h"
 #include "ui/gfx/geometry/mojom/geometry_mojom_traits.h"
-#include "ui/latency/mojo/latency_info_struct_traits.h"
+#include "ui/latency/mojom/latency_info_mojom_traits.h"
 
 #if defined(USE_OZONE)
 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"  // nogncheck

diff --git a/ui/latency/BUILD.gn b/ui/latency/BUILD.gn
@@ -75,14 +75,14 @@ test("latency_unittests") {
   if (!is_ios) {
     sources += [
       "ipc/latency_info_param_traits_unittest.cc",
-      "mojo/struct_traits_unittest.cc",
+      "mojom/mojom_traits_unittest.cc",
     ]
     deps += [
       "//ipc:test_support",
       "//mojo/public/cpp/bindings",
       "//ui/gfx/ipc/geometry",
       "//ui/latency/ipc",
-      "//ui/latency/mojo:test_interfaces",
+      "//ui/latency/mojom:test_interfaces",
     ]
   }
 }

diff --git a/ui/latency/mojo/BUILD.gn → ui/latency/mojom/BUILD.gn b/ui/latency/mojo/BUILD.gn → ui/latency/mojom/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("//mojo/public/tools/bindings/mojom.gni")
 
-mojom("interfaces") {
+mojom("mojom") {
   sources = [
     "latency_info.mojom",
   ]
@@ -21,6 +21,6 @@ mojom("test_interfaces") {
   ]
 
   public_deps = [
-    ":interfaces",
+    ":mojom",
   ]
 }
diff --git a/ui/latency/mojo/DEPS → ui/latency/mojom/DEPS b/ui/latency/mojo/DEPS → ui/latency/mojom/DEPS
diff --git a/ui/latency/mojo/OWNERS → ui/latency/mojom/OWNERS b/ui/latency/mojo/OWNERS → ui/latency/mojom/OWNERS
@@ -4,5 +4,5 @@ per-file *.mojom=file://ipc/SECURITY_OWNERS
 per-file *.typemap=set noparent
 per-file *.typemap=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
diff --git a/ui/latency/mojo/latency_info.mojom → ui/latency/mojom/latency_info.mojom b/ui/latency/mojo/latency_info.mojom → ui/latency/mojom/latency_info.mojom
diff --git a/ui/latency/mojo/latency_info.typemap → ui/latency/mojom/latency_info.typemap b/ui/latency/mojo/latency_info.typemap → ui/latency/mojom/latency_info.typemap
@@ -2,12 +2,12 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-mojom = "//ui/latency/mojo/latency_info.mojom"
+mojom = "//ui/latency/mojom/latency_info.mojom"
 public_headers = [ "//ui/latency/latency_info.h" ]
-traits_headers = [ "//ui/latency/mojo/latency_info_struct_traits.h" ]
+traits_headers = [ "//ui/latency/mojom/latency_info_mojom_traits.h" ]
 sources = [
-  "latency_info_struct_traits.cc",
-  "latency_info_struct_traits.h",
+  "latency_info_mojom_traits.cc",
+  "latency_info_mojom_traits.h",
 ]
 public_deps = [
   "//ui/latency",

diff --git a/...atency/mojo/latency_info_struct_traits.cc → ...atency/mojom/latency_info_mojom_traits.cc b/...atency/mojo/latency_info_struct_traits.cc → ...atency/mojom/latency_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 "ui/latency/mojo/latency_info_struct_traits.h"
+#include "ui/latency/mojom/latency_info_mojom_traits.h"
 
 #include "mojo/public/cpp/base/time_mojom_traits.h"
 

diff --git a/ui/latency/mojo/latency_info_struct_traits.h → ui/latency/mojom/latency_info_mojom_traits.h b/ui/latency/mojo/latency_info_struct_traits.h → ui/latency/mojom/latency_info_mojom_traits.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_LATENCY_MOJO_LATENCY_INFO_STRUCT_TRAITS_H_
-#define UI_LATENCY_MOJO_LATENCY_INFO_STRUCT_TRAITS_H_
+#ifndef UI_LATENCY_MOJOM_LATENCY_INFO_MOJOM_TRAITS_H_
+#define UI_LATENCY_MOJOM_LATENCY_INFO_MOJOM_TRAITS_H_
 
 #include "ui/latency/latency_info.h"
-#include "ui/latency/mojo/latency_info.mojom-shared.h"
+#include "ui/latency/mojom/latency_info.mojom-shared.h"
 
 namespace mojo {
 
@@ -68,4 +68,4 @@ struct EnumTraits<ui::mojom::LatencyComponentType, ui::LatencyComponentType> {
 
 }  // namespace mojo
 
-#endif  // UI_LATENCY_MOJO_LATENCY_INFO_STRUCT_TRAITS_H_
+#endif  // UI_LATENCY_MOJOM_LATENCY_INFO_MOJOM_TRAITS_H_
diff --git a/ui/latency/mojo/struct_traits_unittest.cc → ui/latency/mojom/mojom_traits_unittest.cc b/ui/latency/mojo/struct_traits_unittest.cc → ui/latency/mojom/mojom_traits_unittest.cc
@@ -7,8 +7,8 @@
 #include "base/test/scoped_task_environment.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/latency/mojo/latency_info_struct_traits.h"
-#include "ui/latency/mojo/traits_test_service.mojom.h"
+#include "ui/latency/mojom/latency_info_mojom_traits.h"
+#include "ui/latency/mojom/traits_test_service.mojom.h"
 
 namespace ui {
 

diff --git a/ui/latency/mojo/traits_test_service.mojom → ui/latency/mojom/traits_test_service.mojom b/ui/latency/mojo/traits_test_service.mojom → ui/latency/mojom/traits_test_service.mojom
@@ -4,7 +4,7 @@
 
 module ui.mojom;
 
-import "ui/latency/mojo/latency_info.mojom";
+import "ui/latency/mojom/latency_info.mojom";
 
 interface TraitsTestService {
   [Sync]

diff --git a/ui/latency/mojo/typemaps.gni → ui/latency/mojom/typemaps.gni b/ui/latency/mojo/typemaps.gni → ui/latency/mojom/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 = [ "//ui/latency/mojo/latency_info.typemap" ]
+typemaps = [ "//ui/latency/mojom/latency_info.typemap" ]