Group ConnectToApplication-related info into a params struct.

content/browser/mojo/mojo_shell_context.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 "content/browser/mojo/mojo_shell_context.h"
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "content/common/process_control.mojom.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/utility_process_host.h"
 #include "content/public/browser/utility_process_host_client.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/service_registry.h"
 #include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/common/url_type_converters.h"
-#include "mojo/services/network/public/interfaces/url_loader.mojom.h"
 #include "mojo/shell/application_loader.h"
+#include "mojo/shell/connect_to_application_params.h"
+#include "mojo/shell/identity.h"
 #include "mojo/shell/static_application_loader.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/string.h"
 
 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
 #include "media/mojo/services/mojo_media_application.h"
 #endif
 
 namespace content {
 
@@ skipping 187 matching lines @@
                                      exposed_services.Pass(), filter, callback);
 }
 
 void MojoShellContext::ConnectToApplicationOnOwnThread(
     const GURL& url,
     const GURL& requestor_url,
     mojo::InterfaceRequest<mojo::ServiceProvider> request,
     mojo::ServiceProviderPtr exposed_services,
     const mojo::shell::CapabilityFilter& filter,
     const mojo::Shell::ConnectToApplicationCallback& callback) {
-  mojo::URLRequestPtr url_request = mojo::URLRequest::New();
-  url_request->url = mojo::String::From(url);
-  application_manager_->ConnectToApplication(
-      nullptr, url_request.Pass(), std::string(), requestor_url, request.Pass(),
-      exposed_services.Pass(), filter, base::Bind(&base::DoNothing), callback);
+  scoped_ptr<mojo::shell::ConnectToApplicationParams> params(
+      new mojo::shell::ConnectToApplicationParams);
+  params->set_originator_identity(mojo::shell::Identity(requestor_url));
+  params->set_originator_filter(mojo::shell::GetPermissiveCapabilityFilter());
+  params->SetURLInfo(url);
+  params->set_services(request.Pass());
+  params->set_exposed_services(exposed_services.Pass());
+  params->set_filter(filter);
+  params->set_on_application_end(base::Bind(&base::DoNothing));
+  params->set_connect_callback(callback);
+  application_manager_->ConnectToApplication(params.Pass());
 }
 
 GURL MojoShellContext::ResolveMappings(const GURL& url) {
   return url;
 }
 
 GURL MojoShellContext::ResolveMojoURL(const GURL& url) {
   return url;
 }
 
 bool MojoShellContext::CreateFetcher(
     const GURL& url,
     const mojo::shell::Fetcher::FetchCallback& loader_callback) {
   return false;
 }
 
 }  // namespace content