Revert of Make CapabilityFilter be part of Identity

mojo/shell/application_manager.h

 // 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.
 
 #ifndef MOJO_SHELL_APPLICATION_MANAGER_H_
 #define MOJO_SHELL_APPLICATION_MANAGER_H_
 
 #include <map>
 
 #include "base/macros.h"
@@ skipping 99 matching lines @@
   void HandleFetchCallback(scoped_ptr<ConnectToApplicationParams> params,
                            scoped_ptr<Fetcher> fetcher);
 
   void RunNativeApplication(InterfaceRequest<Application> application_request,
                             bool start_sandboxed,
                             scoped_ptr<Fetcher> fetcher,
                             const base::FilePath& file_path,
                             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,
       URLResponsePtr url_response);
 
   // Returns the appropriate loader for |url|, or the default loader if there is
   // no loader configured for the URL.
   ApplicationLoader* GetLoaderForURL(const GURL& url);
 
   void CleanupRunner(NativeRunner* runner);
@@ skipping 16 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ApplicationManager);
 };
 
 Shell::ConnectToApplicationCallback EmptyConnectCallback();
 
 }  // namespace shell
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_APPLICATION_MANAGER_H_