Revert of 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 320f4eba5478211ea1824633cd8f94b8701ba3ef..eb62ff2adf8d2bfd6bbe349212267957a123dc32 100644
--- a/mojo/shell/BUILD.gn
+++ b/mojo/shell/BUILD.gn
@@ -11,11 +11,15 @@
     "//base",
     "//mojo/common",
     "//mojo/environment:chromium",
-    "//ui/gfx",
+    "//mojo/application_manager",
+    "//mojo/system",
+    "//third_party/icu",
+    "//ui/gl",
+    "//url",
   ]
 
-  if (is_component_build) {
-    deps += ["//ui/gl"]
+  if (use_ozone) {
+    deps += [ "//ui/ozone" ]
   }
 
   sources = [
@@ -36,9 +40,13 @@
     "//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 = [
@@ -76,15 +84,28 @@
   ]
 
   if (is_linux) {
-    deps += ["//dbus"]
+    deps += [
+      "//dbus"
+    ]
   } else if (is_android) {
     deps += [
-      "//mojo/services/native_viewport:lib",
       "//mojo/services/network:lib",
     ]
     sources += [
       "network_application_loader.cc",
       "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",
     ]
   }
 }
@@ -149,7 +170,10 @@
 
   deps = [
     ":lib",
+    "//base",
     "//base:base_static",
+    "//mojo/application_manager",
     "//mojo/system",
+    "//url",
   ]
 }