Second attempt to land change to remove NativeViewportService and

mojo/shell/BUILD.gn

Index: mojo/shell/BUILD.gn
diff --git a/mojo/shell/BUILD.gn b/mojo/shell/BUILD.gn
index eb62ff2adf8d2bfd6bbe349212267957a123dc32..320f4eba5478211ea1824633cd8f94b8701ba3ef 100644
--- a/mojo/shell/BUILD.gn
+++ b/mojo/shell/BUILD.gn
@@ -11,15 +11,11 @@ executable("mojo_shell") {
     "//base",
     "//mojo/common",
     "//mojo/environment:chromium",
-    "//mojo/application_manager",
-    "//mojo/system",
-    "//third_party/icu",
-    "//ui/gl",
-    "//url",
+    "//ui/gfx",
   ]
 
-  if (use_ozone) {
-    deps += [ "//ui/ozone" ]
+  if (is_component_build) {
+    deps += ["//ui/gl"]
   }
 
   sources = [
@@ -40,13 +36,9 @@ source_set("lib") {
     "//mojo/common",
     "//mojo/gles2",
     "//mojo/public/interfaces/application",
-    "//mojo/services/native_viewport",
-    "//mojo/services/public/interfaces/native_viewport",
     "//mojo/services/public/interfaces/network",
     "//mojo/spy",
     "//mojo/system",
-    "//net",
-    "//url",
   ]
 
   sources = [
@@ -84,11 +76,10 @@ source_set("lib") {
   ]
 
   if (is_linux) {
-    deps += [
-      "//dbus"
-    ]
+    deps += ["//dbus"]
   } else if (is_android) {
     deps += [
+      "//mojo/services/native_viewport:lib",
       "//mojo/services/network:lib",
     ]
     sources += [
@@ -96,18 +87,6 @@ source_set("lib") {
       "network_application_loader.h",
     ]
   }
-  if (use_aura) {
-    deps += [
-      # These are only necessary as long as we hard code use of ViewManager.
-      "//skia",
-      "//mojo/services/view_manager",
-      "//mojo/services/public/interfaces/view_manager",
-    ]
-    sources += [
-      "view_manager_loader.cc",
-      "view_manager_loader.h",
-    ]
-  }
 }
 
 mojom("app_child_process_bindings") {
@@ -170,10 +149,7 @@ source_set("test_support") {
 
   deps = [
     ":lib",
-    "//base",
     "//base:base_static",
-    "//mojo/application_manager",
     "//mojo/system",
-    "//url",
   ]
 }