Make CapabilityFilter be part of Identity

mojo/shell/content_handler_connection.h

Index: mojo/shell/content_handler_connection.h
diff --git a/mojo/shell/content_handler_connection.h b/mojo/shell/content_handler_connection.h
index bf4f74e3ae712cb2903fd859657b162225b2ad32..b71422f44b7897dc4b4680aca0fec2a47d2fff25 100644
--- a/mojo/shell/content_handler_connection.h
+++ b/mojo/shell/content_handler_connection.h
@@ -8,14 +8,14 @@
 #include <string>
 
 #include "mojo/application/public/interfaces/content_handler.mojom.h"
-#include "mojo/shell/capability_filter.h"
+#include "mojo/shell/identity.h"
 #include "url/gurl.h"
 
 namespace mojo {
 namespace shell {
 
 class ApplicationManager;
-struct Identity;
+class Identity;
 
 // A ContentHandlerConnection is responsible for creating and maintaining a
 // connection to an app which provides the ContentHandler service.
@@ -27,29 +27,22 @@ class ContentHandlerConnection {
  public:
   // |id| is a unique identifier for this content handler.
   ContentHandlerConnection(ApplicationManager* manager,
-                           const Identity& originator_identity,
-                           const CapabilityFilter& originator_filter,
-                           const GURL& content_handler_url,
-                           const std::string& qualifier,
-                           const CapabilityFilter& filter,
+                           const Identity& source,
+                           const Identity& content_handler,
                            uint32_t id);
 
   // Closes the connection and destroys |this| object.
   void CloseConnection();
 
   ContentHandler* content_handler() { return content_handler_.get(); }
-  const GURL& content_handler_url() { return content_handler_url_; }
-  const std::string& content_handler_qualifier() {
-    return content_handler_qualifier_;
-  }
+  const Identity& identity() const { return identity_; }
   uint32_t id() const { return id_; }
 
  private:
   ~ContentHandlerConnection();
 
   ApplicationManager* manager_;
-  GURL content_handler_url_;
-  std::string content_handler_qualifier_;
+  Identity identity_;
   ContentHandlerPtr content_handler_;
   bool connection_closed_;
   // The id for this content handler.