Simplify some mojo_shell code.

mojo/shell/BUILD.gn

Index: mojo/shell/BUILD.gn
diff --git a/mojo/shell/BUILD.gn b/mojo/shell/BUILD.gn
index c121d575c9b49eaaf0ce44c040279786586a94c2..1dbe6ad77363bd85d31e7590b2fba3330862c4c5 100644
--- a/mojo/shell/BUILD.gn
+++ b/mojo/shell/BUILD.gn
@@ -20,10 +20,6 @@ group("shell") {
     ":tests",
   ]
 
-  if (!is_win) {
-    deps += [ ":mojo_launcher" ]
-  }
-
   if (is_android) {
     deps += [
       ":mojo_shell_apk",
@@ -58,7 +54,11 @@ executable("mojo_shell") {
   ]
 
   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",
@@ -79,23 +79,6 @@ executable("mojo_shell") {
   }
 }
 
-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",
@@ -125,8 +108,6 @@ source_set("in_process_native_runner") {
 
 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",
@@ -463,8 +444,9 @@ mojo_native_application("apptests") {
     "//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",
   ]