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

mojo/shell/content_handler_connection.cc

Index: mojo/shell/content_handler_connection.cc
diff --git a/mojo/shell/content_handler_connection.cc b/mojo/shell/content_handler_connection.cc
index 37b3b4ef99f8fa2d4fce0e751aa8357b38d30ca7..c89b639137d58a401c5335e8d67fad55252614f8 100644
--- a/mojo/shell/content_handler_connection.cc
+++ b/mojo/shell/content_handler_connection.cc
@@ -21,9 +21,11 @@ ContentHandlerConnection::ContentHandlerConnection(
   ServiceProviderPtr services;
   mojo::URLRequestPtr request(mojo::URLRequest::New());
   request->url = mojo::String::From(content_handler_url.spec());
+  // TODO(beng): Need to figure out how to deal with originator and
+  //             CapabilityFilter here.
   manager->ConnectToApplication(
-      request.Pass(), qualifier, requestor_url, GetProxy(&services),
-      nullptr, base::Closure());
+      nullptr, request.Pass(), qualifier, requestor_url, GetProxy(&services),
+      nullptr, nullptr, base::Closure());
   MessagePipe pipe;
   content_handler_.Bind(
       InterfacePtrInfo<ContentHandler>(pipe.handle0.Pass(), 0u));