Port Moterm to Mozart.

apps/moterm/BUILD.gn

Index: apps/moterm/BUILD.gn
diff --git a/apps/moterm/BUILD.gn b/apps/moterm/BUILD.gn
index a69461c8a6b551699342122749824770148a13d3..73b5dc9c267b00f94d277a48ba6b6f44fb11e0f4 100644
--- a/apps/moterm/BUILD.gn
+++ b/apps/moterm/BUILD.gn
@@ -6,48 +6,40 @@ import("//mojo/public/mojo_application.gni")
 
 mojo_native_application("moterm") {
   sources = [
-    "moterm_main.cc",
+    "main.cc",
+    "moterm_app.cc",
+    "moterm_app.h",
     "moterm_view.cc",
     "moterm_view.h",
   ]
 
   deps = [
     ":driver",
-    ":gl_helper",
     ":key_util",
     ":model",
     "//base",
     "//mojo/application",
     "//mojo/common",
+    "//mojo/public/c/gpu",
     "//mojo/public/c/system",
     "//mojo/public/cpp/application",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/bindings:callback",
     "//mojo/services/files/interfaces",
-    "//mojo/services/surfaces/interfaces:surface_id",
+    "//mojo/services/geometry/interfaces",
+    "//mojo/services/gfx/composition/interfaces",
     "//mojo/services/terminal/interfaces",
-    "//mojo/services/view_manager/cpp",
+    "//mojo/services/ui/input/interfaces",
+    "//mojo/services/ui/views/interfaces",
+    "//mojo/skia",
+    "//mojo/ui",
+    "//mojo/ui:ganesh",
+    "//mojo/ui:gl",
     "//skia",
     "//third_party/dejavu-fonts-ttf-2.34:DejaVuSansMonoRegular",
   ]
 }
 
-mojo_native_application("gl_helper_test_app") {
-  sources = [
-    "gl_helper_test_app.cc",
-  ]
-
-  deps = [
-    ":gl_helper",
-    "//base",
-    "//mojo/application",
-    "//mojo/services/geometry/interfaces",
-    "//mojo/services/gpu/interfaces",
-    "//mojo/services/native_viewport/interfaces",
-    "//mojo/services/surfaces/interfaces",
-  ]
-}
-
 source_set("driver") {
   sources = [
     "moterm_driver.cc",
@@ -61,33 +53,6 @@ source_set("driver") {
   ]
 }
 
-source_set("gl_helper") {
-  sources = [
-    "gl_helper.cc",
-    "gl_helper.h",
-  ]
-
-  deps = [
-    "//mojo/public/cpp/application",
-    "//mojo/public/c/gpu",
-    "//mojo/public/interfaces/application",
-    "//mojo/services/gpu/interfaces",
-    "//mojo/services/surfaces/interfaces",
-  ]
-
-  public_deps = [
-    "//base",
-    "//mojo/public/c/gpu",
-    "//mojo/public/c/gpu:GLES2",
-    "//mojo/services/geometry/cpp",
-    "//mojo/services/geometry/interfaces",
-    "//mojo/services/gpu/interfaces",
-    "//mojo/services/surfaces/cpp",
-    "//mojo/services/surfaces/interfaces",
-    "//mojo/services/surfaces/interfaces:surface_id",
-  ]
-}
-
 source_set("key_util") {
   sources = [
     "key_util.cc",
@@ -125,7 +90,6 @@ mojo_native_application("apptests") {
   testonly = true
 
   sources = [
-    "gl_helper_unittest.cc",
     "key_util_unittest.cc",
     "moterm_driver_unittest.cc",
     "moterm_model_unittest.cc",
@@ -133,7 +97,6 @@ mojo_native_application("apptests") {
 
   deps = [
     ":driver",
-    ":gl_helper",
     ":key_util",
     ":model",
     "//mojo/application",