Move more of ContentHandler handling into PackageManager.

mojo/package_manager/BUILD.gn

Index: mojo/package_manager/BUILD.gn
diff --git a/mojo/package_manager/BUILD.gn b/mojo/package_manager/BUILD.gn
index 913a36dac280104c8e2b3ee800c0f0fca143e697..3d69ae9bfd2f3e6de1d4f66f6cca304115fbdb97 100644
--- a/mojo/package_manager/BUILD.gn
+++ b/mojo/package_manager/BUILD.gn
@@ -2,8 +2,12 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//testing/test.gni")
+
 source_set("package_manager") {
   sources = [
+    "content_handler_connection.cc",
+    "content_handler_connection.h",
     "package_manager_impl.cc",
     "package_manager_impl.h",
   ]
@@ -14,3 +18,23 @@ source_set("package_manager") {
     "//mojo/util:filename_util",
   ]
 }
+
+test("unittests") {
+  output_name = "mojo_package_manager_unittests"
+
+  sources = [
+    "capability_filter_content_handler_unittest.cc",
+    "content_handler_unittest.cc",
+  ]
+
+  deps = [
+    ":package_manager",
+    "//base",
+    "//mojo/application/public/cpp",
+    "//mojo/shell",
+    "//mojo/shell:test_support",
+    "//third_party/mojo/src/mojo/edk/test:run_all_unittests",
+    "//testing/gtest",
+    "//url",
+  ]
+}