Decompose Application Package Apptest a bit more.

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("//mojo/public/mojo_application.gni")
 import("//mojo/public/mojo_application_manifest.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
 
 group("all") {
@@ skipping 103 matching lines @@
     "//mojo/shell/public/cpp",
     "//mojo/util:filename_util",
     "//testing/gtest",
     "//url",
   ]
 }
 
 mojom("test_bindings") {
   sources = [
     "application_manager_apptests.mojom",
-    "application_package_apptest.mojom",
     "capability_filter_unittest.mojom",
+    "package_test.mojom",
     "test.mojom",
   ]
 }
 
 mojo_native_application("apptests") {
   output_name = "mojo_shell_apptests"
   testonly = true
 
   sources = [
     "application_manager_apptest.cc",
-    "application_package_apptest.cc",
+    "package_apptest.cc",
   ]
 
   deps = [
     ":apptests_manifest",
     ":test_bindings",
     "//base",
     "//base/test:test_config",
     "//mojo/common:common_base",
     "//mojo/converters/network",
     "//mojo/shell/public/cpp:sources",
     "//mojo/shell/public/cpp:test_support",
     "//mojo/shell/public/interfaces",
   ]
 
   data_deps = [
     ":application_manager_apptest_driver",
     ":application_manager_apptest_target",
+    ":package_test_package",
   ]
 }
 
 mojo_application_manifest("apptests_manifest") {
   application_name = "mojo_shell_apptests"
   source = "application_manager_apptest_manifest.json"
+}
+
+mojo_application_manifest("package_test_a_manifest") {
+  application_name = "package_test_a"
+  source = "package_test_app_a_manifest.json"
+}
+
+mojo_application_manifest("package_test_b_manifest") {
+  application_name = "package_test_b"
+  source = "package_test_app_b_manifest.json"
+}
+
+mojo_native_application("package_test_package") {
+  testonly = true
+  sources = [
+    "package_test_package.cc",
+  ]
+  deps = [
+    ":package_test_package_manifest",
+    ":test_bindings",
+    "//base",
+    "//mojo/common:common_base",
+    "//mojo/shell/public/cpp:sources",
+    "//mojo/shell/public/interfaces",
+  ]
+}
+
+mojo_application_manifest("package_test_package_manifest") {
+  application_name = "package_test_package"
+  source = "package_test_package_manifest.json"
   deps = [
     ":package_test_a_manifest",
     ":package_test_b_manifest",
   ]
   packaged_applications = [
     "package_test_a",
     "package_test_b",
   ]
 }
 
-mojo_application_manifest("package_test_a_manifest") {
-  application_name = "package_test_a"
-  source = "application_package_apptest_app_a_manifest.json"
-}
-
-mojo_application_manifest("package_test_b_manifest") {
-  application_name = "package_test_b"
-  source = "application_package_apptest_app_b_manifest.json"
-}
-
 executable("application_manager_apptest_driver") {
   testonly = true
 
   sources = [
     "application_manager_apptest_driver.cc",
   ]
 
   deps = [
     ":copy_application_manager_apptest_driver_manifest",
     ":test_bindings",
@@ skipping 30 matching lines @@
   deps = [
     ":test_bindings",
     "//base",
     "//build/config/sanitizers:deps",
     "//mojo/common:common_base",
     "//mojo/converters/network",
     "//mojo/shell/public/cpp",
     "//mojo/shell/runner/child:test_native_main",
   ]
 }