Simplify some mojo_shell code.

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("//build/config/ui.gni")
 import("//third_party/mojo/src/mojo/public/mojo.gni")
 import("//third_party/mojo/src/mojo/public/mojo_application.gni")
 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
 
 # We don't support building in the component build since mojo apps are
 # inherently components.
 assert(!is_component_build)
 
 group("shell") {
   testonly = true
 
   deps = [
     ":mojo_shell",
     ":tests",
   ]
 
-  if (!is_win) {
-    deps += [ ":mojo_launcher" ]
-  }
-
   if (is_android) {
     deps += [
       ":mojo_shell_apk",
       ":mojo_shell_tests_apk",
     ]
   }
 }
 
 group("tests") {
   testonly = true
@@ skipping 14 matching lines @@
   deps = [
     ":init",
     ":lib",
     "//base",
     "//build/config/sanitizers:deps",
     "//mojo/common",
     "//mojo/environment:chromium",
   ]
 
   if (!is_android) {
-    sources += [ "desktop/main.cc" ]
+    sources += [
+      "desktop/launcher_process.cc",
+      "desktop/launcher_process.h",
+      "desktop/main.cc",
+    ]
   } else {
     sources += [
       "android/library_loader.cc",
       "android/main.cc",
       "android/main.h",
     ]
 
     # On android, the executable is also the native library used by the apk.
     # It means dynamic symbols must be preserved and exported.
     ldflags = [ "-Wl,--export-dynamic" ]
 
     deps += [
       ":jni_headers",
       "//mojo/services/native_viewport:lib",
       "//mojo/shell/application_manager",
       "//ui/gl",
     ]
   }
 }
 
-executable("mojo_launcher") {
-  sources = [
-    "launcher_main.cc",
-  ]
-
-  deps = [
-    ":init",
-    ":in_process_native_runner",
-    "//base",
-    "//build/config/sanitizers:deps",
-    "//mojo/common",
-    "//third_party/mojo/src/mojo/edk/system",
-    "//mojo/environment:chromium",
-    "//url",
-  ]
-}
-
 source_set("init") {
   sources = [
     "init.cc",
     "init.h",
   ]
 
   deps = [
     "//base",
   ]
 }
 
 source_set("in_process_native_runner") {
   sources = [
     "in_process_native_runner.cc",
     "in_process_native_runner.h",
   ]
 
   public_deps = [
     ":native_application_support",
     "//mojo/shell/application_manager",
   ]
 
   deps = [
     "//base",
   ]
 }
 
 source_set("lib") {
   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",
     "child_process_host.h",
     "command_line_util.cc",
     "command_line_util.h",
     "context.cc",
     "context.h",
@@ skipping 316 matching lines @@
   ]
 
   deps = [
     "//base",
     "//mojo/application",
     "//mojo/application:test_support",
     "//mojo/common:common",
     "//third_party/mojo/src/mojo/public/cpp/bindings:callback",
     "//third_party/mojo/src/mojo/public/cpp/environment",
     "//third_party/mojo/src/mojo/public/cpp/system:system",
-  #  "//mojo/services/http_server/public/cpp",
-   # "//mojo/services/http_server/public/interfaces",
+
+    #"//mojo/services/http_server/public/cpp",
+    #"//mojo/services/http_server/public/interfaces",
     "//mojo/services/network/public/interfaces",
     "//mojo/shell/test:bindings",
   ]
 
   #data_deps = [ "//services/http_server:http_server($default_toolchain)" ]
 }