Move more of ContentHandler handling into PackageManager.

mojo/shell/BUILD.gn

Index: mojo/shell/BUILD.gn
diff --git a/mojo/shell/BUILD.gn b/mojo/shell/BUILD.gn
index 0d57c43d418f33486c2f00f7a767a5d5c651984d..9a1fe459c11744811bdd5a67b21da42034f0156b 100644
--- a/mojo/shell/BUILD.gn
+++ b/mojo/shell/BUILD.gn
@@ -19,8 +19,6 @@ source_set("shell") {
     "connect_to_application_params.h",
     "connect_util.cc",
     "connect_util.h",
-    "content_handler_connection.cc",
-    "content_handler_connection.h",
     "data_pipe_peek.cc",
     "data_pipe_peek.h",
     "fetcher.cc",
@@ -57,18 +55,35 @@ source_set("shell") {
   ]
 }
 
+source_set("test_support") {
+  testonly = true
+  sources = [
+    "capability_filter_test.cc",
+    "capability_filter_test.h",
+    "test_package_manager.cc",
+    "test_package_manager.h",
+  ]
+
+  deps = [
+    ":shell",
+    ":test_bindings",
+    "//mojo/application/public/cpp",
+    "//mojo/application/public/interfaces",
+    "//testing/gtest",
+  ]
+}
+
 test("mojo_shell_unittests") {
   sources = [
     "application_manager_unittest.cc",
     "capability_filter_unittest.cc",
     "query_util_unittest.cc",
-    "test_package_manager.cc",
-    "test_package_manager.h",
   ]
 
   deps = [
     ":shell",
     ":test_bindings",
+    ":test_support",
     "//base",
     "//mojo/application/public/cpp",
     "//third_party/mojo/src/mojo/edk/test:run_all_unittests",