Allow trusted brokers to restrict connections for spawned applications to whitelisted applications …

content/browser/mojo/mojo_shell_context.cc

Index: content/browser/mojo/mojo_shell_context.cc
diff --git a/content/browser/mojo/mojo_shell_context.cc b/content/browser/mojo/mojo_shell_context.cc
index 028bfbcc1f132ca7f3a7ae7be3bf41b1b9a464c4..679a232bd46a21ab8be7e22789bed51b096aa4ca 100644
--- a/content/browser/mojo/mojo_shell_context.cc
+++ b/content/browser/mojo/mojo_shell_context.cc
@@ -98,11 +98,13 @@ class MojoShellContext::Proxy {
       const GURL& url,
       const GURL& requestor_url,
       mojo::InterfaceRequest<mojo::ServiceProvider> request,
-      mojo::ServiceProviderPtr exposed_services) {
+      mojo::ServiceProviderPtr exposed_services,
+      mojo::CapabilityFilterPtr filter) {
     if (task_runner_ == base::ThreadTaskRunnerHandle::Get()) {
       if (shell_context_) {
         shell_context_->ConnectToApplicationOnOwnThread(
-            url, requestor_url, request.Pass(), exposed_services.Pass());
+            url, requestor_url, request.Pass(), exposed_services.Pass(),
+            filter.Pass());
       }
     } else {
       // |shell_context_| outlives the main MessageLoop, so it's safe for it to
@@ -111,7 +113,8 @@ class MojoShellContext::Proxy {
           FROM_HERE,
           base::Bind(&MojoShellContext::ConnectToApplicationOnOwnThread,
                      base::Unretained(shell_context_), url, requestor_url,
-                     base::Passed(&request), base::Passed(&exposed_services)));
+                     base::Passed(&request), base::Passed(&exposed_services),
+                     base::Passed(&filter)));
     }
   }
 
@@ -182,21 +185,23 @@ void MojoShellContext::ConnectToApplication(
     const GURL& url,
     const GURL& requestor_url,
     mojo::InterfaceRequest<mojo::ServiceProvider> request,
-    mojo::ServiceProviderPtr exposed_services) {
+    mojo::ServiceProviderPtr exposed_services,
+    mojo::CapabilityFilterPtr filter) {
   proxy_.Get()->ConnectToApplication(url, requestor_url, request.Pass(),
-                                     exposed_services.Pass());
+                                     exposed_services.Pass(), filter.Pass());
 }
 
 void MojoShellContext::ConnectToApplicationOnOwnThread(
     const GURL& url,
     const GURL& requestor_url,
     mojo::InterfaceRequest<mojo::ServiceProvider> request,
-    mojo::ServiceProviderPtr exposed_services) {
+    mojo::ServiceProviderPtr exposed_services,
+    mojo::CapabilityFilterPtr filter) {
   mojo::URLRequestPtr url_request = mojo::URLRequest::New();
   url_request->url = mojo::String::From(url);
   application_manager_->ConnectToApplication(
-      url_request.Pass(), std::string(), requestor_url, request.Pass(),
-      exposed_services.Pass(), base::Bind(&base::DoNothing));
+      nullptr, url_request.Pass(), std::string(), requestor_url, request.Pass(),
+      exposed_services.Pass(), filter.Pass(), base::Bind(&base::DoNothing));
 }
 
 GURL MojoShellContext::ResolveMappings(const GURL& url) {