Revert of Make CapabilityFilter be part of Identity

mojo/runner/shell_test_base.cc

 // Copyright 2014 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/runner/shell_test_base.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 29 matching lines @@
 }
 
 void ShellTestBase::TearDown() {
   shell_context_.Shutdown();
 }
 
 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->SetTarget(shell::Identity(application_url, std::string(),
-                                    shell::GetPermissiveCapabilityFilter()));
+  params->SetURLInfo(request.Pass());
   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;
   services->ConnectToService(service_name, pipe.handle1.Pass());
   return pipe.handle0.Pass();
 }
 
 #if !defined(OS_ANDROID)
 base::FilePath ShellTestBase::GetTestAppFilePath() const {
   base::FilePath shell_dir;
   PathService::Get(base::DIR_MODULE, &shell_dir);
   return shell_dir;
 }
 #endif
 
 }  // namespace test
 }  // namespace runner
 }  // namespace mojo