Make CapabilityFilter be part of Identity

mojo/shell/application_manager_unittest.cc

Index: mojo/shell/application_manager_unittest.cc
diff --git a/mojo/shell/application_manager_unittest.cc b/mojo/shell/application_manager_unittest.cc
index 8cc0456236a4cca79976c25cd077e0402bdc86a1..bc4e2daf6b108c1f0c12e8fe9efd35cedbb7248e 100644
--- a/mojo/shell/application_manager_unittest.cc
+++ b/mojo/shell/application_manager_unittest.cc
@@ -687,8 +687,7 @@ TEST_F(ApplicationManagerTest, TestEndApplicationClosure) {
 
   bool called = false;
   scoped_ptr<ConnectToApplicationParams> params(new ConnectToApplicationParams);
-  params->SetURLInfo(GURL("test:test"));
-  params->set_filter(GetPermissiveCapabilityFilter());
+  params->SetTargetURL(GURL("test:test"));
   params->set_on_application_end(
       base::Bind(&QuitClosure, base::Unretained(&called)));
   application_manager_->ConnectToApplication(params.Pass());
@@ -716,10 +715,8 @@ TEST(ApplicationManagerTest2, ContentHandlerConnectionGetsRequestorURL) {
 
   bool called = false;
   scoped_ptr<ConnectToApplicationParams> params(new ConnectToApplicationParams);
-  params->set_originator_identity(Identity(requestor_url));
-  params->set_originator_filter(GetPermissiveCapabilityFilter());
-  params->SetURLInfo(GURL("test:test"));
-  params->set_filter(GetPermissiveCapabilityFilter());
+  params->set_source(Identity(requestor_url));
+  params->SetTargetURL(GURL("test:test"));
   params->set_on_application_end(
       base::Bind(&QuitClosure, base::Unretained(&called)));
   application_manager.ConnectToApplication(params.Pass());
@@ -788,10 +785,8 @@ TEST(ApplicationManagerTest2,
     base::RunLoop run_loop;
     scoped_ptr<ConnectToApplicationParams> params(
         new ConnectToApplicationParams);
-    params->set_originator_identity(Identity(requestor_url));
-    params->set_originator_filter(GetPermissiveCapabilityFilter());
-    params->SetURLInfo(GURL("test:test"));
-    params->set_filter(GetPermissiveCapabilityFilter());
+    params->set_source(Identity(requestor_url));
+    params->SetTargetURL(GURL("test:test"));
     params->set_connect_callback([&content_handler_id, &run_loop](uint32_t t) {
       content_handler_id = t;
       run_loop.Quit();
@@ -806,10 +801,8 @@ TEST(ApplicationManagerTest2,
     base::RunLoop run_loop;
     scoped_ptr<ConnectToApplicationParams> params(
         new ConnectToApplicationParams);
-    params->set_originator_identity(Identity(requestor_url));
-    params->set_originator_filter(GetPermissiveCapabilityFilter());
-    params->SetURLInfo(GURL("test:test"));
-    params->set_filter(GetPermissiveCapabilityFilter());
+    params->set_source(Identity(requestor_url));
+    params->SetTargetURL(GURL("test:test"));
     params->set_connect_callback([&content_handler_id2, &run_loop](uint32_t t) {
       content_handler_id2 = t;
       run_loop.Quit();
@@ -846,10 +839,8 @@ TEST(ApplicationManagerTest2, DifferedContentHandlersGetDifferentIDs) {
     base::RunLoop run_loop;
     scoped_ptr<ConnectToApplicationParams> params(
         new ConnectToApplicationParams);
-    params->set_originator_identity(Identity(requestor_url));
-    params->set_originator_filter(GetPermissiveCapabilityFilter());
-    params->SetURLInfo(GURL("test:test"));
-    params->set_filter(GetPermissiveCapabilityFilter());
+    params->set_source(Identity(requestor_url));
+    params->SetTargetURL(GURL("test:test"));
     params->set_connect_callback([&content_handler_id, &run_loop](uint32_t t) {
       content_handler_id = t;
       run_loop.Quit();
@@ -878,10 +869,8 @@ TEST(ApplicationManagerTest2, DifferedContentHandlersGetDifferentIDs) {
     base::RunLoop run_loop;
     scoped_ptr<ConnectToApplicationParams> params(
         new ConnectToApplicationParams);
-    params->set_originator_identity(Identity(requestor_url));
-    params->set_originator_filter(GetPermissiveCapabilityFilter());
-    params->SetURLInfo(GURL("test2:test2"));
-    params->set_filter(GetPermissiveCapabilityFilter());
+    params->set_source(Identity(requestor_url));
+    params->SetTargetURL(GURL("test2:test2"));
     params->set_connect_callback([&content_handler_id2, &run_loop](uint32_t t) {
       content_handler_id2 = t;
       run_loop.Quit();
@@ -901,8 +890,7 @@ TEST_F(ApplicationManagerTest,
 
   uint32_t content_handler_id = 1u;
   scoped_ptr<ConnectToApplicationParams> params(new ConnectToApplicationParams);
-  params->SetURLInfo(GURL("test:test"));
-  params->set_filter(GetPermissiveCapabilityFilter());
+  params->SetTargetURL(GURL("test:test"));
   params->set_connect_callback(
       [&content_handler_id](uint32_t t) { content_handler_id = t; });
   application_manager_->ConnectToApplication(params.Pass());