Group ConnectToApplication-related info into a params struct.

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 d93dbee40cd89a74f8f683a6f373f0a296154326..bf4f74e3ae712cb2903fd859657b162225b2ad32 100644
--- a/mojo/shell/content_handler_connection.h
+++ b/mojo/shell/content_handler_connection.h
@@ -14,8 +14,8 @@
 namespace mojo {
 namespace shell {
 
-class ApplicationInstance;
 class ApplicationManager;
+struct Identity;
 
 // A ContentHandlerConnection is responsible for creating and maintaining a
 // connection to an app which provides the ContentHandler service.
@@ -26,10 +26,10 @@ class ApplicationManager;
 class ContentHandlerConnection {
  public:
   // |id| is a unique identifier for this content handler.
-  ContentHandlerConnection(ApplicationInstance* originator,
-                           ApplicationManager* manager,
+  ContentHandlerConnection(ApplicationManager* manager,
+                           const Identity& originator_identity,
+                           const CapabilityFilter& originator_filter,
                            const GURL& content_handler_url,
-                           const GURL& requestor_url,
                            const std::string& qualifier,
                            const CapabilityFilter& filter,
                            uint32_t id);