Fix privileged services/viz paths.

The README file for services/viz paths is not consistent with where
privileged things should go. It uses the following contradictory
locations:

services/viz/{gl, compositing, hit_test}/privileged/interfaces
services/viz/privileged/interfaces/{gl, compositing, hit_test}

Offline discussion with servizes/viz/OWNERS concluded we should use the
second one. This CL fixes the README to be consistent and fixes paths
appropriately.

Bug: 722935
Change-Id: I6c63f4d4f1f3c464a456d607419f307912fec593
Reviewed-on: https://chromium-review.googlesource.com/617882
Commit-Queue: kylechar <kylechar@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#495257}

components/viz/host/BUILD.gn

@@ -38,7 +38,7 @@ viz_component("host") {
   public_deps = [
     "//gpu/command_buffer/client",
     "//gpu/ipc/host",
-    "//services/viz/compositing/privileged/interfaces",
+    "//services/viz/privileged/interfaces/compositing",
     "//services/viz/public/interfaces/hit_test",
     "//ui/gfx/geometry",
   ]

components/viz/host/DEPS

@@ -8,8 +8,7 @@ include_rules = [
   "+gpu/ipc/common",
   "+gpu/ipc/host",
   "+mojo/public/cpp",
-  "+services/viz/compositing/privileged/interfaces",
-  "+services/viz/gl/privileged",
+  "+services/viz/privileged/interfaces",
   "+services/viz/public/interfaces/compositing",
   "+ui/gfx",
 ]

components/viz/host/host_frame_sink_manager.h

@@ -20,7 +20,7 @@
 #include "components/viz/host/viz_host_export.h"
 #include "components/viz/service/frame_sinks/compositor_frame_sink_support_manager.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "services/viz/compositing/privileged/interfaces/frame_sink_manager.mojom.h"
+#include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h"
 
 namespace base {
 class SingleThreadTaskRunner;

components/viz/host/host_frame_sink_manager_unittests.cc

@@ -14,7 +14,7 @@
 #include "components/viz/service/frame_sinks/compositor_frame_sink_support.h"
 #include "components/viz/service/frame_sinks/frame_sink_manager_impl.h"
 #include "components/viz/service/surfaces/surface_manager.h"
-#include "services/viz/compositing/privileged/interfaces/frame_sink_manager.mojom.h"
+#include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

components/viz/host/server_gpu_memory_buffer_manager.cc

@@ -12,7 +12,7 @@
 #include "gpu/ipc/client/gpu_memory_buffer_impl.h"
 #include "gpu/ipc/client/gpu_memory_buffer_impl_shared_memory.h"
 #include "gpu/ipc/common/gpu_memory_buffer_support.h"
-#include "services/viz/gl/privileged/interfaces/gpu_service.mojom.h"
+#include "services/viz/privileged/interfaces/gl/gpu_service.mojom.h"
 #include "ui/gfx/buffer_format_util.h"
 
 namespace viz {

components/viz/host/server_gpu_memory_buffer_manager_unittest.cc

@@ -7,7 +7,7 @@
 #include "base/run_loop.h"
 #include "base/threading/thread.h"
 #include "gpu/ipc/host/gpu_memory_buffer_support.h"
-#include "services/viz/gl/privileged/interfaces/gpu_service.mojom.h"
+#include "services/viz/privileged/interfaces/gl/gpu_service.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/client_native_pixmap_factory.h"
 

components/viz/service/BUILD.gn

@@ -125,7 +125,7 @@ viz_component("service") {
     "//cc/ipc:interfaces",
     "//gpu/command_buffer/client:gles2_interface",
     "//gpu/ipc:command_buffer",
-    "//services/viz/compositing/privileged/interfaces",
+    "//services/viz/privileged/interfaces/compositing",
     "//services/viz/public/interfaces/compositing",
     "//services/viz/public/interfaces/hit_test",
     "//ui/gfx",

components/viz/service/DEPS

@@ -2,6 +2,7 @@ include_rules = [
   "+cc",
   "-components/viz/common/switches.h",
   "+components/viz/service",
+  "+services/viz/privileged/interfaces",
   "+services/viz/public/interfaces",
   "+third_party/skia",
   "+ui/gfx",
@@ -12,6 +13,5 @@ include_rules = [
 specific_include_rules = {
   ".*_unittest\.cc": [
     "+components/viz/test",
-    "+services/compositing/privileged/interfaces",
   ]
 }

components/viz/service/frame_sinks/DEPS

@@ -5,5 +5,4 @@ include_rules = [
   "+components/viz/service/surfaces",
   "+gpu/ipc/common",
   "+mojo/public/cpp/bindings",
-  "+services/viz/compositing/privileged/interfaces",
 ]

components/viz/service/frame_sinks/compositor_frame_sink_support_unittest.cc

@@ -19,7 +19,7 @@
 #include "components/viz/test/fake_external_begin_frame_source.h"
 #include "components/viz/test/fake_surface_observer.h"
 #include "components/viz/test/mock_compositor_frame_sink_support_client.h"
-#include "services/viz/compositing/privileged/interfaces/frame_sink_manager.mojom.h"
+#include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

components/viz/service/frame_sinks/frame_sink_manager_impl.h

@@ -21,7 +21,7 @@
 #include "components/viz/service/viz_service_export.h"
 #include "gpu/ipc/common/surface_handle.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "services/viz/compositing/privileged/interfaces/frame_sink_manager.mojom.h"
+#include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h"
 
 namespace cc {
 

components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h

@@ -15,7 +15,7 @@
 #include "components/viz/service/hit_test/hit_test_aggregator_delegate.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "services/viz/compositing/privileged/interfaces/frame_sink_manager.mojom.h"
+#include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h"
 #include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
 
 namespace viz {

components/viz/service/gl/DEPS

@@ -9,7 +9,6 @@ include_rules = [
   "+media/mojo",
   "+mojo/public/cpp",
   "+services/ui/gpu/interfaces",
-  "+services/viz/gl/privileged/interfaces",
   "+ui/gl",
 ]
 

components/viz/service/gl/gpu_service_impl.h

@@ -25,7 +25,7 @@
 #include "gpu/ipc/service/x_util.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/ui/gpu/interfaces/gpu_host.mojom.h"
-#include "services/viz/gl/privileged/interfaces/gpu_service.mojom.h"
+#include "services/viz/privileged/interfaces/gl/gpu_service.mojom.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace gpu {

content/browser/gpu/gpu_ipc_browsertests.cc

@@ -16,7 +16,7 @@
 #include "content/public/test/content_browser_test.h"
 #include "gpu/ipc/client/gpu_channel_host.h"
 #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h"
-#include "services/viz/gl/privileged/interfaces/gpu_service.mojom.h"
+#include "services/viz/privileged/interfaces/gl/gpu_service.mojom.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkSurface.h"

content/browser/gpu/gpu_process_host.h

@@ -33,7 +33,7 @@
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/ui/gpu/interfaces/gpu_host.mojom.h"
 #include "services/ui/gpu/interfaces/gpu_main.mojom.h"
-#include "services/viz/gl/privileged/interfaces/gpu_service.mojom.h"
+#include "services/viz/privileged/interfaces/gl/gpu_service.mojom.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 #include "url/gurl.h"

content/gpu/DEPS

@@ -9,7 +9,7 @@ include_rules = [
   "+services/shape_detection",
   "+services/ui/common",
   "+services/ui/gpu",
-  "+services/viz/gl/privileged/interfaces",
+  "+services/viz/privileged/interfaces/gl",
   "+sandbox",
   "+skia",
 ]

content/gpu/gpu_child_thread.cc

@@ -29,7 +29,7 @@
 #include "media/gpu/ipc/service/media_gpu_channel_manager.h"
 #include "services/service_manager/public/cpp/binder_registry.h"
 #include "services/service_manager/public/cpp/connector.h"
-#include "services/viz/gl/privileged/interfaces/gpu_service.mojom.h"
+#include "services/viz/privileged/interfaces/gl/gpu_service.mojom.h"
 
 #if defined(USE_OZONE)
 #include "ui/ozone/public/ozone_platform.h"

mojo/public/tools/bindings/chromium_bindings_configuration.gni

@@ -35,7 +35,7 @@ _typemap_imports = [
   "//services/ui/gpu/interfaces/typemaps.gni",
   "//services/ui/public/interfaces/cursor/typemaps.gni",
   "//services/ui/public/interfaces/ime/typemaps.gni",
-  "//services/viz/compositing/privileged/interfaces/typemaps.gni",
+  "//services/viz/privileged/interfaces/compositing/typemaps.gni",
   "//services/viz/public/cpp/compositing/typemaps.gni",
   "//skia/public/interfaces/typemaps.gni",
   "//third_party/WebKit/public/public_typemaps.gni",

services/BUILD.gn

@@ -28,7 +28,7 @@ service_test("services_unittests") {
       "//services/preferences:tests",
       "//services/resource_coordinator:tests",
       "//services/shape_detection:tests",
-      "//services/viz/compositing/privileged/interfaces:tests",
+      "//services/viz/privileged/interfaces:unit_tests",
       "//services/viz/public/cpp/compositing:tests",
     ]
   }

services/ui/gpu/DEPS

@@ -6,7 +6,7 @@ include_rules = [
   "+gpu/ipc/common",
   "+gpu/ipc/service",
   "-services/ui/common",
-  "+services/viz/gl/privileged/interfaces",
+  "+services/viz/privileged/interfaces/gl",
 ]
 
 specific_include_rules = {

services/ui/gpu/gpu_main.h

@@ -11,7 +11,7 @@
 #include "gpu/ipc/service/gpu_init.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/ui/gpu/interfaces/gpu_main.mojom.h"
-#include "services/viz/gl/privileged/interfaces/gpu_service.mojom.h"
+#include "services/viz/privileged/interfaces/gl/gpu_service.mojom.h"
 
 namespace gpu {
 class GpuMemoryBufferFactory;

services/ui/gpu/interfaces/BUILD.gn

@@ -17,8 +17,8 @@ mojom("interfaces") {
     "//media/gpu/mojo:jpeg_decoder",
     "//media/mojo/interfaces",
     "//services/ui/public/interfaces",
-    "//services/viz/compositing/privileged/interfaces",
-    "//services/viz/gl/privileged/interfaces",
+    "//services/viz/privileged/interfaces/compositing",
+    "//services/viz/privileged/interfaces/gl",
     "//ui/gfx/geometry/mojo",
     "//ui/gfx/mojo",
     "//url/mojo:url_mojom_gurl",

services/ui/gpu/interfaces/gpu_main.mojom

@@ -6,8 +6,8 @@ module ui.mojom;
 
 import "gpu/ipc/common/gpu_preferences.mojom";
 import "services/ui/gpu/interfaces/gpu_host.mojom";
-import "services/viz/compositing/privileged/interfaces/frame_sink_manager.mojom";
-import "services/viz/gl/privileged/interfaces/gpu_service.mojom";
+import "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom";
+import "services/viz/privileged/interfaces/gl/gpu_service.mojom";
 
 // This is the primordial interface used to (re)start the mus-gpu bundle
 // of services.

services/ui/ws/BUILD.gn

@@ -146,7 +146,7 @@ static_library("lib") {
     "//services/ui/common:mus_common",
     "//services/ui/display",
     "//services/ui/public/interfaces",
-    "//services/viz/compositing/privileged/interfaces",
+    "//services/viz/privileged/interfaces/compositing",
     "//ui/base",
     "//ui/display",
     "//ui/events",

services/ui/ws/DEPS

@@ -7,8 +7,7 @@ include_rules = [
   "+gpu/ipc/common",
   "+services/ui/gpu/interfaces",
   "-services/ui/surfaces",
-  "+services/viz/compositing/privileged/interfaces",
-  "+services/viz/gl/privileged/interfaces",
+  "+services/viz/privileged/interfaces",
   "+services/viz/public/interfaces/compositing",
 ]
 

services/ui/ws/compositor_frame_sink_client_binding.h

@@ -8,7 +8,7 @@
 #include "base/macros.h"
 #include "components/viz/common/surfaces/local_surface_id_allocator.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "services/viz/compositing/privileged/interfaces/frame_sink_manager.mojom.h"
+#include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h"
 #include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
 
 namespace ui {

services/ui/ws/frame_sink_manager_client_binding.h

@@ -7,7 +7,7 @@
 
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "services/viz/compositing/privileged/interfaces/frame_sink_manager.mojom.h"
+#include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h"
 
 namespace ui {
 namespace ws {

services/ui/ws/gpu_client.cc

@@ -5,7 +5,7 @@
 #include "services/ui/ws/gpu_client.h"
 
 #include "components/viz/host/server_gpu_memory_buffer_manager.h"
-#include "services/viz/gl/privileged/interfaces/gpu_service.mojom.h"
+#include "services/viz/privileged/interfaces/gl/gpu_service.mojom.h"
 
 namespace {
 

services/ui/ws/gpu_host.h

@@ -16,7 +16,7 @@
 #include "services/ui/gpu/gpu_main.h"
 #include "services/ui/gpu/interfaces/gpu_host.mojom.h"
 #include "services/ui/public/interfaces/gpu.mojom.h"
-#include "services/viz/gl/privileged/interfaces/gpu_service.mojom.h"
+#include "services/viz/privileged/interfaces/gl/gpu_service.mojom.h"
 
 namespace viz {
 class ServerGpuMemoryBufferManager;

services/ui/ws/server_window.h

@@ -18,7 +18,7 @@
 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "services/ui/ws/ids.h"
-#include "services/viz/compositing/privileged/interfaces/frame_sink_manager.mojom.h"
+#include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h"
 #include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
 #include "ui/base/window_tracker_template.h"
 #include "ui/gfx/geometry/insets.h"

services/ui/ws/server_window_compositor_frame_sink_manager.h

@@ -10,7 +10,7 @@
 #include "components/viz/common/surfaces/surface_id.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
-#include "services/viz/compositing/privileged/interfaces/frame_sink_manager.mojom.h"
+#include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h"
 #include "services/viz/public/interfaces/compositing/compositor_frame.mojom.h"
 
 namespace ui {

services/ui/ws/test_frame_sink_manager.h

@@ -6,7 +6,7 @@
 #define SERVICES_UI_WS_TEST_FRAME_SINK_MANAGER_H_
 
 #include "base/macros.h"
-#include "services/viz/compositing/privileged/interfaces/frame_sink_manager.mojom.h"
+#include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h"
 
 namespace ui {
 namespace ws {

services/ui/ws/window_server.h

@@ -28,7 +28,7 @@
 #include "services/ui/ws/user_id_tracker.h"
 #include "services/ui/ws/user_id_tracker_observer.h"
 #include "services/ui/ws/window_manager_window_tree_factory_set.h"
-#include "services/viz/compositing/privileged/interfaces/frame_sink_manager.mojom.h"
+#include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h"
 
 namespace ui {
 namespace ws {

services/viz/README.md

@@ -60,7 +60,7 @@ there are StructTraits with the interfaces that produce/consume data_types for
 mojo transport.
 
 ```
-//services/viz/{compositing, gl, hit_test, media}/private/interfaces
+//services/viz/private/interfaces/{compositing, gl, hit_test, media}
 ```
 
 These interfaces directories contain mojoms that may only be used by going
@@ -72,8 +72,8 @@ directories must not. There is no private client library, as these are meant for
 consumption by the public client library.
 
 ```
-//services/viz/{compositing, gl, hit_test, media}/privileged/interfaces
-//services/viz/{compositing, gl, hit_test, media}/privileged/<language>
+//services/viz/privileged/interfaces/{compositing, gl, hit_test, media}
+//services/viz/privileged/<language>/{compositing, gl, hit_test, media}
 ```
 
 The interfaces directories contains mojoms that may only be used by the
@@ -88,7 +88,7 @@ window server serves as the privileged client to Viz.
 ```
 
 This is the glue code that implements the primordial VizMain interface (in
-`//services/viz/main/privileged/interfaces`) that starts up the Viz process
+`//services/viz/privileged/interfaces/main`) that starts up the Viz process
 through the service manager. VizMain is a factory interface that enables the
 privileged client to instantiate the Viz subservices: compositing, gl, hit_test,
 and media.
@@ -115,7 +115,7 @@ Once the content module has been removed (or no longer depends on
 appropriate destinations in `//services/viz/public/<language>/...`.
 `//components/viz/service` will move to the appropriate service directories in
 `//services/viz/...`. `//components/viz/host` will move to
-`//services/viz/{compositing, gl, hit_test, media}/privileged`.
+`//services/viz/privileged/<language>/{compositing, gl, hit_test, media}`.
 
 Once the content module is gone, and `//services/ui` is the only privileged
 client, then perhaps the privileged client library may move to `//services/ui`.

services/viz/compositing/privileged/interfaces/BUILD.gn → services/viz/privileged/interfaces/BUILD.gn

@@ -2,38 +2,20 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//mojo/public/tools/bindings/mojom.gni")
-
-mojom("interfaces") {
-  sources = [
-    "frame_sink_manager.mojom",
-    "renderer_settings.mojom",
-  ]
-
-  public_deps = [
-    "//cc/ipc:interfaces",
-    "//gpu/ipc/common:interfaces",
-    "//mojo/common:common_custom_types",
-    "//services/viz/public/interfaces/compositing",
-    "//ui/gfx/geometry/mojo",
-    "//ui/gfx/mojo",
-  ]
-}
-
-source_set("tests") {
+source_set("unit_tests") {
   testonly = true
 
   sources = [
     "struct_traits_unittest.cc",
   ]
 
   deps = [
-    ":interfaces",
     "//base/test:test_support",
     "//components/viz/common:common",
     "//media/capture/mojo:capture_types",
     "//services/service_manager/public/cpp",
     "//services/service_manager/public/cpp:service_test_support",
+    "//services/viz/privileged/interfaces/compositing",
     "//testing/gtest",
     "//ui/gfx:test_support",
   ]