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

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")
 
@@ skipping 94 matching lines @@
     "//base",
   ]
 }
 
 source_set("lib") {
   sources = [
     "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",
     "filename_util.cc",
     "filename_util.h",
     "out_of_process_native_runner.cc",
     "out_of_process_native_runner.h",
     "task_runners.cc",
     "task_runners.h",
     "url_resolver.cc",
     "url_resolver.h",
@@ skipping 227 matching lines @@
 
   deps = [
     "//third_party/mojo/src/mojo/public/interfaces/application",
   ]
 }
 
 # GYP version: mojo/mojo.gyp:mojo_shell_tests
 test("mojo_shell_tests") {
   sources = [
     "child_process_host_unittest.cc",
+    "command_line_util_unittest.cc",
     "data_pipe_peek_unittest.cc",
     "in_process_native_runner_unittest.cc",
     "native_runner_unittest.cc",
     "shell_test_base.cc",
     "shell_test_base.h",
     "shell_test_base_android.cc",
     "shell_test_base_unittest.cc",
     "shell_test_main.cc",
     "url_resolver_unittest.cc",
   ]
@@ skipping 69 matching lines @@
     "//third_party/mojo/src/mojo/public/cpp/system:system",
 
     #"//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)" ]
 }