Do some plumbing.

shell/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 "shell/context.h"
 
 #include <vector>
 
 #include "base/base_switches.h"
 #include "base/bind.h"
@@ skipping 14 matching lines @@
 #include "mojo/common/tracing_impl.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/simple_platform_support.h"
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "mojo/services/tracing/public/interfaces/tracing.mojom.h"
 #include "shell/application_manager/application_loader.h"
 #include "shell/application_manager/application_manager.h"
+#include "shell/application_manager/native_application_options.h"
 #include "shell/background_application_loader.h"
 #include "shell/command_line_util.h"
 #include "shell/filename_util.h"
 #include "shell/in_process_native_runner.h"
 #include "shell/out_of_process_native_runner.h"
 #include "shell/switches.h"
 #include "shell/tracer.h"
 #include "url/gurl.h"
 
 #if !defined(OS_MACOSX)
@@ skipping 127 matching lines @@
     manager->RegisterContentHandler(parts[i], url);
   }
 }
 
 void InitNativeOptions(ApplicationManager* manager,
                        const base::CommandLine& command_line) {
   std::vector<std::string> force_in_process_url_list;
   base::SplitString(command_line.GetSwitchValueASCII(switches::kForceInProcess),
                     ',', &force_in_process_url_list);
   for (const auto& force_in_process_url : force_in_process_url_list) {
-    GURL gurl(force_in_process_url);
-    if (!gurl.is_valid()) {
+    GURL url(force_in_process_url);
+    if (!url.is_valid()) {
       LOG(ERROR) << "Invalid value for switch " << switches::kForceInProcess
                  << ": '" << force_in_process_url << "'is not a valid URL.";
       return;
     }
 
-    NativeRunnerFactory::Options options;
-    options.force_in_process = true;
-    manager->SetNativeOptionsForURL(options, gurl);
+    manager->GetNativeApplicationOptionsForURL(url)->force_in_process = true;
   }
+
+  // TODO(vtl): This is a total hack. We should have a systematic way of
+  // configuring options for native apps.
+  manager->GetNativeApplicationOptionsForURL(GURL("mojo:native_support"))
+      ->allow_new_privs = true;
 }
 
 class TracingServiceProvider : public ServiceProvider {
  public:
   TracingServiceProvider(Tracer* tracer,
                          mojo::InterfaceRequest<ServiceProvider> request)
       : tracer_(tracer), binding_(this, request.Pass()) {}
   ~TracingServiceProvider() override {}
 
   void ConnectToService(const mojo::String& service_name,
@@ skipping 181 matching lines @@
     app_urls_.erase(url);
     if (app_urls_.empty() && base::MessageLoop::current()->is_running()) {
       DCHECK_EQ(base::MessageLoop::current()->task_runner(),
                 task_runners_->shell_runner());
       base::MessageLoop::current()->Quit();
     }
   }
 }
 
 }  // namespace shell