Decompose Application Package Apptest a bit more.

mojo/shell/BUILD.gn

Index: mojo/shell/BUILD.gn
diff --git a/mojo/shell/BUILD.gn b/mojo/shell/BUILD.gn
index 1adf80069e1cabd541c241d41cd86b958350a55f..c0154a72a660d94b1175e711af1c3d02dd99ed6e 100644
--- a/mojo/shell/BUILD.gn
+++ b/mojo/shell/BUILD.gn
@@ -121,8 +121,8 @@ test("mojo_shell_unittests") {
 mojom("test_bindings") {
   sources = [
     "application_manager_apptests.mojom",
-    "application_package_apptest.mojom",
     "capability_filter_unittest.mojom",
+    "package_test.mojom",
     "test.mojom",
   ]
 }
@@ -133,7 +133,7 @@ mojo_native_application("apptests") {
 
   sources = [
     "application_manager_apptest.cc",
-    "application_package_apptest.cc",
+    "package_apptest.cc",
   ]
 
   deps = [
@@ -151,30 +151,51 @@ mojo_native_application("apptests") {
   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"
-  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"
+  source = "package_test_app_a_manifest.json"
 }
 
 mojo_application_manifest("package_test_b_manifest") {
   application_name = "package_test_b"
-  source = "application_package_apptest_app_b_manifest.json"
+  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",
+  ]
 }
 
 executable("application_manager_apptest_driver") {