Improve process launch handle sharing API.

content/common/sandbox_win.cc

 // Copyright (c) 2012 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/common/sandbox_win.h"
 
 #include <stddef.h>
 
 #include <string>
 
@@ skipping 702 matching lines @@
 
 bool InitTargetServices(sandbox::TargetServices* target_services) {
   DCHECK(target_services);
   sandbox::ResultCode result = target_services->Init();
   return sandbox::SBOX_ALL_OK == result;
 }
 
 sandbox::ResultCode StartSandboxedProcess(
     SandboxedProcessLauncherDelegate* delegate,
     base::CommandLine* cmd_line,
-    const base::HandlesToInheritVector& handles_to_inherit,
+    const std::vector<HANDLE>& handles_to_inherit,
     base::Process* process) {
   DCHECK(delegate);
   const base::CommandLine& browser_command_line =
       *base::CommandLine::ForCurrentProcess();
   std::string type_str = cmd_line->GetSwitchValueASCII(switches::kProcessType);
 
   TRACE_EVENT1("startup", "StartProcessWithAccess", "type", type_str);
 
   // Propagate the --allow-no-job flag if present.
   if (browser_command_line.HasSwitch(switches::kAllowNoSandboxJob) &&
       !cmd_line->HasSwitch(switches::kAllowNoSandboxJob)) {
     cmd_line->AppendSwitch(switches::kAllowNoSandboxJob);
   }
 
   ProcessDebugFlags(cmd_line);
 
   if ((!delegate->ShouldSandbox()) ||
       browser_command_line.HasSwitch(switches::kNoSandbox) ||
       cmd_line->HasSwitch(switches::kNoSandbox)) {
     base::LaunchOptions options;
-
-    base::HandlesToInheritVector handles = handles_to_inherit;
-    if (!handles_to_inherit.empty()) {
-      options.inherit_handles = true;
-      options.handles_to_inherit = &handles;
-    }
+    options.handles_to_inherit = handles_to_inherit;
     base::Process unsandboxed_process = base::LaunchProcess(*cmd_line, options);
 
     *process = std::move(unsandboxed_process);
     return sandbox::SBOX_ALL_OK;
   }
 
   scoped_refptr<sandbox::TargetPolicy> policy =
       g_broker_services->CreatePolicy();
 
   // Add any handles to be inherited to the policy.
@@ skipping 127 matching lines @@
   }
 
   delegate->PostSpawnTarget(target.process_handle());
 
   CHECK(ResumeThread(target.thread_handle()) != static_cast<DWORD>(-1));
   *process = base::Process(target.TakeProcessHandle());
   return sandbox::SBOX_ALL_OK;
 }
 
 }  // namespace content