Make CapabilityFilter be part of Identity

mojo/shell/connect_util.cc

 // Copyright 2015 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.
 
 #include "mojo/shell/connect_util.h"
 
 #include "mojo/shell/application_manager.h"
 #include "mojo/shell/capability_filter.h"
 #include "mojo/shell/connect_to_application_params.h"
 
 namespace mojo {
 namespace shell {
 
 ScopedMessagePipeHandle ConnectToServiceByName(
     ApplicationManager* application_manager,
     const GURL& application_url,
     const std::string& interface_name) {
   ServiceProviderPtr services;
   scoped_ptr<ConnectToApplicationParams> params(new ConnectToApplicationParams);
-  params->SetURLInfo(application_url);
+  params->SetTarget(Identity(application_url, std::string(),
+                             GetPermissiveCapabilityFilter()));
   params->set_services(GetProxy(&services));
-  params->set_filter(GetPermissiveCapabilityFilter());
   application_manager->ConnectToApplication(params.Pass());
   MessagePipe pipe;
   services->ConnectToService(interface_name, pipe.handle1.Pass());
   return pipe.handle0.Pass();
 }
 
 }  // namespace shell
 }  // namespace mojo