Revert of Second attempt to land change to remove NativeViewportService and

mojo/shell/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//build/config/ui.gni")
 
 executable("mojo_shell") {
   deps = [
     ":lib",
     "//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 = [
     "desktop/mojo_main.cc"
   ]
 }
 
 # GYP version: mojo/mojo.gyp:mojo_shell_lib
 source_set("lib") {
   deps = [
     ":app_child_process_bindings",
     ":external_service_bindings",
     "//base",
     "//base/third_party/dynamic_annotations",
     "//base:base_static",
     "//mojo/application",
     "//mojo/application_manager",
     "//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 = [
     "app_child_process.cc",
     "app_child_process.h",
     "app_child_process_host.cc",
     "app_child_process_host.h",
     "child_process.cc",
     "child_process.h",
     "child_process_host.cc",
@@ skipping 17 matching lines @@
     "switches.h",
     "task_runners.cc",
     "task_runners.h",
     "test_child_process.cc",
     "test_child_process.h",
     "ui_application_loader_android.cc",
     "ui_application_loader_android.h",
   ]
 
   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",
+    ]
+  }
 }
 
 mojom("app_child_process_bindings") {
   sources = [
     "app_child_process.mojom"
   ]
 }
 
 mojom("external_service_bindings") {
   sources = [
@@ skipping 42 matching lines @@
 
 # GYP version: mojo/mojo.gyp:mojo_shell_test_support
 source_set("test_support") {
   sources = [
     "shell_test_helper.cc",
     "shell_test_helper.h",
   ]
 
   deps = [
     ":lib",
+    "//base",
     "//base:base_static",
+    "//mojo/application_manager",
     "//mojo/system",
+    "//url",
   ]
 }