Make CapabilityFilter be part of Identity

mojo/shell/capability_filter_unittest.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 "base/at_exit.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 323 matching lines @@
  protected:
   void RunApplication(const std::string& url, const CapabilityFilter& filter) {
     ServiceProviderPtr services;
 
     // We expose Validator to the test application via ConnectToApplication
     // because we don't allow the test application to connect to test:validator.
     // Adding it to the CapabilityFilter would interfere with the 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());
   }
 
   void InitValidator(const std::set<std::string>& expectations) {
     validator_ = new ConnectionValidator(expectations, &loop_);
     application_manager()->SetLoaderForURL(make_scoped_ptr(validator_),
                                            GURL("test:validator"));
   }
 
@@ skipping 32 matching lines @@
 
   // Overridden from testing::Test:
   void SetUp() override {
     test_package_manager_ = new CFTestPackageManager;
     application_manager_.reset(
         new ApplicationManager(make_scoped_ptr(test_package_manager_)));
     CreateLoader<ServiceApplication>("test:service");
     CreateLoader<ServiceApplication>("test:service2");
   }
   void TearDown() override {
+    test_package_manager_->set_use_test_fetcher(false);
     application_manager_.reset();
-    test_package_manager_->set_use_test_fetcher(false);
   }
 
  private:
   template<class T>
   scoped_ptr<ApplicationDelegate> CreateApplicationDelegate() {
     return scoped_ptr<ApplicationDelegate>(new T);
   }
 
   CFTestPackageManager* test_package_manager_;
   base::ShadowingAtExitManager at_exit_;
@@ skipping 129 matching lines @@
   RunTest();
 }
 
 TEST_F(CapabilityFilter_WildcardsTest, ContentHandler) {
   RunContentHandlerTest();
 }
 
 }  // namespace
 }  // namespace shell
 }  // namespace mojo