Moves services implementations out of third_party/mojo_services

components/view_manager/BUILD.gn

Index: components/view_manager/BUILD.gn
diff --git a/components/view_manager/BUILD.gn b/components/view_manager/BUILD.gn
index 9ae3c4d015ef62bfea6f07358aa129ff4dff2657..008d19c59e49220a7597a8e34c387143af14f0d3 100644
--- a/components/view_manager/BUILD.gn
+++ b/components/view_manager/BUILD.gn
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
-import("//third_party/mojo/src/mojo/public/mojo_application.gni")
 import("//testing/test.gni")
+import("//third_party/mojo/src/mojo/public/mojo_application.gni")
 
 mojo_native_application("view_manager") {
   sources = [
@@ -16,13 +16,13 @@ mojo_native_application("view_manager") {
   deps = [
     ":view_manager_lib",
     "//base",
+    "//components/view_manager/public/interfaces",
+    "//components/window_manager/public/interfaces",
     "//mojo/application",
     "//mojo/common:tracing_impl",
-    "//mojo/environment:chromium",
     "//mojo/converters/geometry",
+    "//mojo/environment:chromium",
     "//third_party/mojo/src/mojo/public/cpp/bindings:bindings",
-    "//third_party/mojo_services/src/view_manager/public/interfaces",
-    "//third_party/mojo_services/src/window_manager/public/interfaces",
   ]
 }
 
@@ -68,13 +68,18 @@ source_set("view_manager_lib") {
   ]
 
   public_deps = [
-    "//third_party/mojo_services/src/view_manager/public/cpp",
+    "//components/view_manager/public/cpp",
   ]
 
   deps = [
     "//base",
     "//cc/surfaces",
     "//cc/surfaces:surface_id",
+    "//components/native_viewport/public/interfaces",
+    "//components/surfaces/public/interfaces",
+    "//components/view_manager/public/cpp:common",
+    "//components/view_manager/public/interfaces",
+    "//components/window_manager/public/interfaces",
     "//mojo/application",
     "//mojo/common",
     "//mojo/converters/geometry",
@@ -83,13 +88,8 @@ source_set("view_manager_lib") {
     "//third_party/mojo/src/mojo/public/cpp/bindings:bindings",
     "//third_party/mojo/src/mojo/public/cpp/bindings:callback",
     "//third_party/mojo/src/mojo/public/interfaces/application",
-    "//third_party/mojo_services/src/geometry/public/interfaces",
-    "//third_party/mojo_services/src/input_events/public/interfaces",
-    "//third_party/mojo_services/src/native_viewport/public/interfaces",
-    "//third_party/mojo_services/src/surfaces/public/interfaces",
-    "//third_party/mojo_services/src/view_manager/public/interfaces",
-    "//third_party/mojo_services/src/view_manager/public/cpp:common",
-    "//third_party/mojo_services/src/window_manager/public/interfaces",
+    "//ui/mojo/geometry:interfaces",
+    "//ui/mojo/events:interfaces",
     "//ui/gfx",
     "//ui/gfx/geometry",
   ]
@@ -105,12 +105,12 @@ source_set("test_support") {
 
   deps = [
     "//base",
+    "//components/view_manager/public/cpp",
+    "//components/view_manager/public/cpp:common",
+    "//components/view_manager/public/interfaces",
     "//mojo/common",
     "//third_party/mojo/src/mojo/public/cpp/bindings:bindings",
-    "//third_party/mojo_services/src/geometry/public/interfaces",
-    "//third_party/mojo_services/src/view_manager/public/cpp",
-    "//third_party/mojo_services/src/view_manager/public/cpp:common",
-    "//third_party/mojo_services/src/view_manager/public/interfaces",
+    "//ui/mojo/geometry:interfaces",
   ]
 }
 
@@ -132,18 +132,18 @@ test("view_manager_service_unittests") {
     ":view_manager_lib",
     "//base",
     "//base/test:test_config",
+    "//components/native_viewport/public/cpp:args",
+    "//components/view_manager/public/cpp",
+    "//components/view_manager/public/interfaces",
+    "//components/window_manager/public/interfaces",
     "//mojo/converters/geometry",
     "//mojo/converters/input_events",
-    "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
     "//mojo/environment:chromium",
+    "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
     "//third_party/mojo/src/mojo/public/cpp/bindings:bindings",
     "//third_party/mojo/src/mojo/public/interfaces/application",
-    "//third_party/mojo_services/src/geometry/public/interfaces",
-    "//third_party/mojo_services/src/input_events/public/interfaces",
-    "//third_party/mojo_services/src/native_viewport/public/cpp:args",
-    "//third_party/mojo_services/src/view_manager/public/cpp",
-    "//third_party/mojo_services/src/view_manager/public/interfaces",
-    "//third_party/mojo_services/src/window_manager/public/interfaces",
+    "//ui/mojo/geometry:interfaces",
+    "//ui/mojo/events:interfaces",
     "//testing/gtest",
     "//ui/gfx",
     "//ui/gfx:test_support",
@@ -168,14 +168,14 @@ mojo_native_application("apptests") {
     ":test_support",
     "//base",
     "//base/test:test_config",
+    "//components/view_manager/public/cpp",
+    "//components/view_manager/public/interfaces",
+    "//components/window_manager/public/interfaces",
     "//mojo/application",
     "//mojo/application:test_support",
     "//mojo/common",
     "//third_party/mojo/src/mojo/public/cpp/bindings:bindings",
-    "//third_party/mojo_services/src/geometry/public/cpp:cpp",
-    "//third_party/mojo_services/src/geometry/public/interfaces",
-    "//third_party/mojo_services/src/view_manager/public/cpp",
-    "//third_party/mojo_services/src/view_manager/public/interfaces",
-    "//third_party/mojo_services/src/window_manager/public/interfaces",
+    "//ui/mojo/geometry:interfaces",
+    "//ui/mojo/geometry:util",
   ]
 }