Revert of Make CapabilityFilter be part of Identity

mojo/shell/application_manager.h

Index: mojo/shell/application_manager.h
diff --git a/mojo/shell/application_manager.h b/mojo/shell/application_manager.h
index 6f93628e638f8443119a4b4c36ad133c4210bb73..c7ca5dd0a48456aec81a07c3a40b142fe6de43a6 100644
--- a/mojo/shell/application_manager.h
+++ b/mojo/shell/application_manager.h
@@ -117,8 +117,11 @@
                             bool path_exists);
 
   void LoadWithContentHandler(
-      const Identity& source,
-      const Identity& content_handler,
+      const Identity& originator_identity,
+      const CapabilityFilter& originator_filter,
+      const GURL& content_handler_url,
+      const std::string& qualifier,
+      const CapabilityFilter& filter,
       const Shell::ConnectToApplicationCallback& connect_callback,
       ApplicationInstance* app,
       InterfaceRequest<Application> application_request,