Revert of Simplify mojo_shell since it's now only used for Mandoline.

mojo/services/window_manager/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_application.gni")
 import("//testing/test.gni")
 
+mojo_native_application("window_manager") {
+  sources = [
+    "main.cc",
+  ]
+
+  public_deps = [
+    ":lib",
+  ]
+
+  deps = [
+    "//base",
+    "//mojo/application",
+    "//mojo/common:tracing_impl",
+    "//third_party/mojo_services/src/view_manager/public/cpp",
+  ]
+}
+
 source_set("lib") {
   sources = [
     "basic_focus_rules.cc",
     "basic_focus_rules.h",
     "capture_controller.cc",
     "capture_controller.h",
     "capture_controller_observer.h",
     "focus_controller.cc",
     "focus_controller.h",
     "focus_controller_observer.h",
@@ skipping 65 matching lines @@
     "//ui/gfx",
     "//ui/gfx:test_support",
     "//ui/gl",
   ]
 
   if (use_x11) {
     deps += [ "//ui/gfx/x" ]
   }
 }
 
-# A basic window manager with a default delegate used for testing.
-mojo_native_application("test_window_manager") {
-  sources = [
-    "main.cc",
-  ]
-
-  public_deps = [
-    ":lib",
-  ]
-
-  deps = [
-    "//base",
-    "//mojo/application",
-    "//mojo/common:tracing_impl",
-    "//third_party/mojo_services/src/view_manager/public/cpp",
-  ]
-}
-
 mojo_native_application("window_manager_apptests") {
   testonly = true
 
   sources = [
     "window_manager_apptest.cc",
   ]
 
   deps = [
     "//base",
     "//mojo/application",
     "//mojo/application:test_support",
     "//mojo/environment:chromium",
     "//third_party/mojo/src/mojo/public/cpp/system:system",
     "//third_party/mojo_services/src/view_manager/public/cpp",
     "//third_party/mojo_services/src/window_manager/public/interfaces",
   ]
 
-  data_deps = [ ":test_window_manager($default_toolchain)" ]
+  data_deps = [ ":window_manager($default_toolchain)" ]
 }