Move more of ContentHandler handling into PackageManager.

mojo/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")
 
 group("mojo") {
   # Meta-target, don't link into production code.
   testonly = true
   deps = [
@@ skipping 66 matching lines @@
     "//third_party/mojo/src/mojo/edk/system:mojo_system_unittests",
     "//third_party/mojo/src/mojo/edk/test:mojo_public_bindings_unittests",
     "//third_party/mojo/src/mojo/edk/test:mojo_public_environment_unittests",
     "//third_party/mojo/src/mojo/edk/test:mojo_public_system_perftests",
     "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests",
     "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests",
   ]
 
   if (!is_component_build) {
     deps += [
+      "//mojo/package_manager:unittests",
       "//mojo/runner:apptests",
-      "//mojo/runner:mojo_runner_unittests",
+      "//mojo/runner:unittests",
       "//mojo/services/network:apptests",
-      "//mojo/shell:mojo_shell_unittests",
+      "//mojo/shell:unittests",
     ]
 
     if (is_android) {
       deps += [ "//mojo/runner:mojo_runner_apptests_apk" ]
     }
   }
 }