Move more of ContentHandler handling into PackageManager.

mojo/shell/package_manager.h

Index: mojo/shell/package_manager.h
diff --git a/mojo/shell/package_manager.h b/mojo/shell/package_manager.h
index 1b46164c31d2adee175ce6688f05af08a48c96ad..0aa102962f73bd90c05305ff2688ba92b910ce1a 100644
--- a/mojo/shell/package_manager.h
+++ b/mojo/shell/package_manager.h
@@ -5,7 +5,9 @@
 #ifndef MOJO_SHELL_PACKAGE_MANAGER_H_
 #define MOJO_SHELL_PACKAGE_MANAGER_H_
 
+#include "mojo/application/public/interfaces/application.mojom.h"
 #include "mojo/services/network/public/interfaces/url_loader.mojom.h"
+#include "mojo/shell/capability_filter.h"
 #include "mojo/shell/fetcher.h"
 
 class GURL;
@@ -14,6 +16,7 @@ namespace mojo {
 namespace shell {
 
 class ApplicationManager;
+class Identity;
 
 // A class implementing this interface assists Shell::ConnectToApplication in
 // fetching the applications located therein.
@@ -42,12 +45,12 @@ class PackageManager {
   // run, unchanged if the return value is false.
   // |qualifier| is the Identity qualifier that the content handler application
   // instance should be associated with, unchanged if the return value is false.
-  virtual bool HandleWithContentHandler(Fetcher* fetcher,
-                                        const GURL& url,
-                                        base::TaskRunner* task_runner,
-                                        URLResponsePtr* new_response,
-                                        GURL* content_handler_url,
-                                        std::string* qualifier) = 0;
+  virtual uint32_t HandleWithContentHandler(
+      Fetcher* fetcher,
+      const Identity& source,
+      const GURL& target_url,
+      const CapabilityFilter& target_filter,
+      InterfaceRequest<Application>* application_request) = 0;
 };
 
 }  // namespace shell