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

mojo/runner/context.cc

 // Copyright 2013 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/context.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 176 matching lines @@
     LOG(ERROR) << "Invalid value for switch "
                << devtools_service::kRemoteDebuggingPort << ": '" << port_str
                << "' is not a valid port number.";
     return;
   }
 
   ServiceProviderPtr devtools_service_provider;
   URLRequestPtr request(URLRequest::New());
   request->url = "mojo:devtools_service";
   manager->ConnectToApplication(
-      request.Pass(), std::string(), GURL("mojo:shell"),
-      GetProxy(&devtools_service_provider), nullptr, base::Closure());
+      nullptr, request.Pass(), std::string(), GURL("mojo:shell"),
+      GetProxy(&devtools_service_provider), nullptr, nullptr, base::Closure());
 
   devtools_service::DevToolsCoordinatorPtr devtools_coordinator;
   devtools_service_provider->ConnectToService(
       devtools_service::DevToolsCoordinator::Name_,
       GetProxy(&devtools_coordinator).PassMessagePipe());
   devtools_coordinator->Initialize(static_cast<uint16_t>(port));
 }
 
 class TracingServiceProvider : public ServiceProvider {
  public:
@@ skipping 93 matching lines @@
           switches::kDisableCache));
 
   InitContentHandlers(&application_manager_, command_line);
   InitNativeOptions(&application_manager_, command_line);
 
   ServiceProviderPtr tracing_service_provider_ptr;
   new TracingServiceProvider(GetProxy(&tracing_service_provider_ptr));
   mojo::URLRequestPtr request(mojo::URLRequest::New());
   request->url = mojo::String::From("mojo:tracing");
   application_manager_.ConnectToApplication(
-      request.Pass(), std::string(), GURL(""), nullptr,
-      tracing_service_provider_ptr.Pass(), base::Closure());
+      nullptr, request.Pass(), std::string(), GURL(""), nullptr,
+      tracing_service_provider_ptr.Pass(), nullptr, base::Closure());
 
   InitDevToolsServiceIfNeeded(&application_manager_, command_line);
 
   return true;
 }
 
 void Context::Shutdown() {
   TRACE_EVENT0("mojo_shell", "Context::Shutdown");
   DCHECK_EQ(base::MessageLoop::current()->task_runner(),
             task_runners_->shell_runner());
@@ skipping 24 matching lines @@
 
 void Context::Run(const GURL& url) {
   DCHECK(app_complete_callback_.is_null());
   ServiceProviderPtr services;
   ServiceProviderPtr exposed_services;
 
   app_urls_.insert(url);
   mojo::URLRequestPtr request(mojo::URLRequest::New());
   request->url = mojo::String::From(url.spec());
   application_manager_.ConnectToApplication(
-      request.Pass(), std::string(), GURL(), GetProxy(&services),
-      exposed_services.Pass(),
+      nullptr, request.Pass(), std::string(), GURL(), GetProxy(&services),
+      exposed_services.Pass(), nullptr,
       base::Bind(&Context::OnApplicationEnd, base::Unretained(this), url));
 }
 
 void Context::RunCommandLineApplication(const base::Closure& callback) {
   DCHECK(app_urls_.empty());
   DCHECK(app_complete_callback_.is_null());
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   base::CommandLine::StringVector args = command_line->GetArgs();
   for (size_t i = 0; i < args.size(); ++i) {
     GURL possible_app(args[i]);
@@ skipping 15 matching lines @@
         base::MessageLoop::current()->Quit();
       } else {
         app_complete_callback_.Run();
       }
     }
   }
 }
 
 }  // namespace runner
 }  // namespace mojo