Make CapabilityFilter be part of Identity

mojo/shell/capability_filter_unittest.cc

Index: mojo/shell/capability_filter_unittest.cc
diff --git a/mojo/shell/capability_filter_unittest.cc b/mojo/shell/capability_filter_unittest.cc
index 1dbc35b168a3e31608f9647291ea154477fe35b6..bdb864573d7cb96399a66550f544bff2a7f2a368 100644
--- a/mojo/shell/capability_filter_unittest.cc
+++ b/mojo/shell/capability_filter_unittest.cc
@@ -341,15 +341,11 @@ class CapabilityFilterTest : public testing::Test {
     ServiceProviderPtr exposed_services;
     (new ServiceProviderImpl(GetProxy(&exposed_services)))->
         AddService<Validator>(validator_);
-    URLRequestPtr request(URLRequest::New());
-    request->url = String::From(url);
-
     scoped_ptr<ConnectToApplicationParams> params(
         new ConnectToApplicationParams);
-    params->SetURLInfo(request.Pass());
+    params->SetTarget(Identity(GURL(url), std::string(), filter));
     params->set_services(GetProxy(&services));
     params->set_exposed_services(exposed_services.Pass());
-    params->set_filter(filter);
     params->set_on_application_end(base::MessageLoop::QuitWhenIdleClosure());
     application_manager_->ConnectToApplication(params.Pass());
   }
@@ -402,8 +398,8 @@ class CapabilityFilterTest : public testing::Test {
     CreateLoader<ServiceApplication>("test:service2");
   }
   void TearDown() override {
-    application_manager_.reset();
     test_package_manager_->set_use_test_fetcher(false);
+    application_manager_.reset();
   }
 
  private: