Rename traits and mojo directory in //services/viz/public

This CL renames mojo to mojom and *_struct_traits.* to
*_mojom_traits.* in //services/viz/public.

*_struct_traits.* => *_mojom_traits.*
services/viz/public/interfaces => services/viz/public/mojom

Bug: 806965
Change-Id: If8838d8a33c1063b4ce97cc791723a2e89d9f632
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715488
Commit-Queue: Miyoung Shin <myid.shin@igalia.com>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: enne <enne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#681628}

diff --git a/cc/BUILD.gn b/cc/BUILD.gn
index 80c2ef76..a39b7bb 100644
--- a/cc/BUILD.gn
+++ b/cc/BUILD.gn

@@ -831,7 +831,7 @@
     "//media",
     "//mojo/core/embedder",
     "//mojo/public/cpp/bindings",
-    "//services/viz/public/interfaces",
+    "//services/viz/public/mojom",
     "//skia",
     "//testing/gmock",
     "//testing/gtest",

diff --git a/cc/mojo_embedder/BUILD.gn b/cc/mojo_embedder/BUILD.gn
index 3abdc4c..63e0725 100644
--- a/cc/mojo_embedder/BUILD.gn
+++ b/cc/mojo_embedder/BUILD.gn

@@ -19,6 +19,6 @@
     "//components/viz/client",
     "//components/viz/common",
     "//mojo/public/cpp/bindings",
-    "//services/viz/public/interfaces",
+    "//services/viz/public/mojom",
   ]
 }

diff --git a/cc/mojo_embedder/DEPS b/cc/mojo_embedder/DEPS
index d5c8e6fc..325a68d 100644
--- a/cc/mojo_embedder/DEPS
+++ b/cc/mojo_embedder/DEPS

@@ -1,4 +1,4 @@
 include_rules = [
   "+mojo/public/cpp/bindings",
-  "+services/viz/public/interfaces/compositing",
+  "+services/viz/public/mojom/compositing",
 ]

diff --git a/cc/mojo_embedder/async_layer_tree_frame_sink.h b/cc/mojo_embedder/async_layer_tree_frame_sink.h
index 1b176d0..70f521b 100644
--- a/cc/mojo_embedder/async_layer_tree_frame_sink.h
+++ b/cc/mojo_embedder/async_layer_tree_frame_sink.h

@@ -20,7 +20,7 @@
 #include "components/viz/common/surfaces/parent_local_surface_id_allocator.h"
 #include "components/viz/common/surfaces/surface_id.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
 
 namespace base {
 class HistogramBase;

diff --git a/cc/mojo_embedder/async_layer_tree_frame_sink_unittest.cc b/cc/mojo_embedder/async_layer_tree_frame_sink_unittest.cc
index 8205b65..95580ee 100644
--- a/cc/mojo_embedder/async_layer_tree_frame_sink_unittest.cc
+++ b/cc/mojo_embedder/async_layer_tree_frame_sink_unittest.cc

@@ -23,7 +23,7 @@
 #include "components/viz/test/test_context_provider.h"
 #include "components/viz/test/test_gpu_memory_buffer_manager.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {

diff --git a/cc/test/DEPS b/cc/test/DEPS
index 525f2332..b2da679b 100644
--- a/cc/test/DEPS
+++ b/cc/test/DEPS

@@ -11,7 +11,7 @@
   "+gpu/config/gpu_info.h",
   "+gpu/ipc",
   "+services/viz/privileged/interfaces/gl/gpu_host.mojom.h",
-  "+services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h",
+  "+services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h",
 ]
 
 specific_include_rules = {

diff --git a/cc/test/test_layer_tree_frame_sink.h b/cc/test/test_layer_tree_frame_sink.h
index 73de92c..c283a57 100644
--- a/cc/test/test_layer_tree_frame_sink.h
+++ b/cc/test/test_layer_tree_frame_sink.h

@@ -16,7 +16,7 @@
 #include "components/viz/service/display/display_client.h"
 #include "components/viz/service/frame_sinks/frame_sink_manager_impl.h"
 #include "components/viz/test/test_shared_bitmap_manager.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
 
 namespace base {
 class SingleThreadTaskRunner;