Shell: switches cleanup.

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("//mojo/public/mojo.gni")
 import("//mojo/public/mojo_application.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//mojo/tools/embed/rules.gni")
 import("//testing/test.gni")
@@ skipping 26 matching lines @@
   ]
 }
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
 
 if (!mojo_use_prebuilt_mojo_shell) {
   shell_common_deps = [
-    ":lib",
+    ":parent_lib",
     "//base",
     "//base/allocator",
     "//build/config/sanitizers:deps",
     "//mojo/common",
     "//mojo/environment:chromium",
   ]
   shell_common_data_deps = [ ":mojo_shell_child" ]
 
   if (is_android) {
     shared_library("mojo_shell") {
@@ skipping 25 matching lines @@
       data_deps = shell_common_data_deps
     }
   }
 
   executable("mojo_shell_child") {
     sources = [
       "child_main.cc",
     ]
 
     deps = [
-      # TODO(vtl): Reduce these dependencies (probably mostly in :lib).
       ":child_controller_bindings",
       ":common_lib",
       "//base",
       "//base/allocator",
       "//build/config/sanitizers:deps",
       "//mojo/common",
       "//mojo/edk/system",
       "//mojo/environment:chromium",
     ]
   }
 }  # !mojo_use_prebuilt_mojo_shell
 
 # Files used both by mojo_shell and mojo_shell_child (and tests).
 source_set("common_lib") {
   sources = [
+    "child_switches.cc",
+    "child_switches.h",
     "init.cc",
     "init.h",
   ]
 
   deps = [
     "//base",
   ]
 
   public_deps = [
     ":native_application_support",
-    ":switches",
   ]
 }
 
-# TODO(vtl): Split this target into parent/child/common libs.
-source_set("lib") {
+source_set("parent_lib") {
   sources = [
     "background_application_loader.cc",
     "background_application_loader.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",
     "in_process_native_runner.cc",
     "in_process_native_runner.h",
     "out_of_process_native_runner.cc",
     "out_of_process_native_runner.h",
+    "switches.cc",
+    "switches.h",
     "task_runners.cc",
     "task_runners.h",
     "tracer.cc",
     "tracer.h",
     "url_resolver.cc",
     "url_resolver.h",
     "url_response_disk_cache_loader.cc",
     "url_response_disk_cache_loader.h",
   ]
 
@@ skipping 71 matching lines @@
 
   # This target has to include the public thunk headers, which generally
   # shouldn't be included without picking an implementation. We are providing
   # the implementation but the thunk header target cannot declare that we are
   # permitted to include it since it's in the public SDK and we are not.
   # Suppress include checking so we can still check the rest of the targets in
   # this file.
   check_includes = false
 }
 
-# TODO(vtl): This should just be a part of :common_lib, but stuff in
-# application_manager uses it. We should fix that.
-source_set("switches") {
-  sources = [
-    "switches.cc",
-    "switches.h",
-  ]
-
-  deps = [
-    "//base",
-  ]
-}
-
 if (is_android) {
   generate_jni("jni_headers") {
     sources = [
       "android/apk/src/org/chromium/mojo/shell/AndroidHandler.java",
       "android/apk/src/org/chromium/mojo/shell/Bootstrap.java",
       "android/apk/src/org/chromium/mojo/shell/IntentReceiverRegistry.java",
       "android/apk/src/org/chromium/mojo/shell/Keyboard.java",
       "android/apk/src/org/chromium/mojo/shell/ShellMain.java",
       "android/tests/src/org/chromium/mojo/shell/ShellTestBase.java",
     ]
@@ skipping 134 matching lines @@
     "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",
   ]
 
   deps = [
-    ":lib",
+    ":parent_lib",
     "//base",
     "//base:i18n",
     "//base/test:test_support",
     "//testing/gtest",
     "//url",
     "//mojo/common",
     "//mojo/edk/system",
     "//mojo/environment:chromium",
     "//mojo/public/cpp/bindings",
     "//services/test_service:bindings",
@@ skipping 48 matching lines @@
     "//mojo/public/cpp/system:system",
     "//mojo/services/http_server/public/cpp",
     "//mojo/services/http_server/public/interfaces",
     "//mojo/services/network/public/interfaces",
     "//shell/test:bindings",
     ":embed_pingable",
   ]
 
   data_deps = [ "//services/http_server:http_server($default_toolchain)" ]
 }