Make CapabilityFilter be part of Identity

mojo/runner/shell_test_base.cc

Index: mojo/runner/shell_test_base.cc
diff --git a/mojo/runner/shell_test_base.cc b/mojo/runner/shell_test_base.cc
index 517a6910ceed94bf356b0b7d344538e7a52aa441..07f9d826c1c219e473aac943b84165adba8aefc1 100644
--- a/mojo/runner/shell_test_base.cc
+++ b/mojo/runner/shell_test_base.cc
@@ -47,14 +47,12 @@ ScopedMessagePipeHandle ShellTestBase::ConnectToService(
     const GURL& application_url,
     const std::string& service_name) {
   ServiceProviderPtr services;
-  mojo::URLRequestPtr request(mojo::URLRequest::New());
-  request->url = mojo::String::From(application_url.spec());
 
   scoped_ptr<shell::ConnectToApplicationParams> params(
       new shell::ConnectToApplicationParams);
-  params->SetURLInfo(request.Pass());
+  params->SetTarget(shell::Identity(application_url, std::string(),
+                                    shell::GetPermissiveCapabilityFilter()));
   params->set_services(GetProxy(&services));
-  params->set_filter(shell::GetPermissiveCapabilityFilter());
   params->set_on_application_end(base::Bind(&QuitIfRunning));
   shell_context_.application_manager()->ConnectToApplication(params.Pass());
   MessagePipe pipe;