Revert "Delete the ViewManager and WindowManager services."

services/BUILD.gn

Index: services/BUILD.gn
diff --git a/services/BUILD.gn b/services/BUILD.gn
index e44f1c22452cb7cd138aa1a6e2a4841c9a3dc9eb..50ab043ddd424c01eeb1798624daec0921b5197c 100644
--- a/services/BUILD.gn
+++ b/services/BUILD.gn
@@ -52,10 +52,13 @@ group("services") {
     deps += [
       "//services/device_info",
       "//services/files",
+      "//services/kiosk_wm",
       "//services/ui",
       "//services/native_viewport",
       "//services/surfaces",
       "//services/url_response_disk_cache",
+      "//services/view_manager",
+      "//services/window_manager",
     ]
   }
 
@@ -90,6 +93,13 @@ group("tests") {
     deps += [ "//services/notifications:apptests" ]
   }
 
+  if (is_linux || is_android) {
+    deps += [
+      "//services/window_manager:window_manager_apptests",
+      "//services/window_manager:window_manager_unittests",
+    ]
+  }
+
   # TODO(jamesr): We only support building V8 snapshot data on a linux host since it
   # needs a 32 bit toolchain and we don't have one configured for mac hosts.
   # TODO(cstout): javascript/v8 build support for fnl/musl
@@ -101,6 +111,9 @@ group("tests") {
     deps += [
       "//services/files:apptests",
       "//services/url_response_disk_cache:tests",
+      "//services/view_manager:mojo_view_manager_client_apptests",
+      "//services/view_manager:view_manager_service_apptests",
+      "//services/view_manager:view_manager_service_unittests",
     ]
   }
 }