Merge 237541 "Revert of https://codereview.chromium.org/71013004/"

sandbox/win/src/restricted_token_utils.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 <aclapi.h>
 #include <sddl.h>
 #include <vector>
 
 #include "sandbox/win/src/restricted_token_utils.h"
 
@@ skipping 165 matching lines @@
                                    impersonation_level,
                                    INTEGRITY_LEVEL_LAST,
                                    IMPERSONATION);
   if (ERROR_SUCCESS != err_code) {
     return err_code;
   }
   base::win::ScopedHandle impersonation_token(impersonation_token_handle);
 
   // Start the process
   STARTUPINFO startup_info = {0};
-  PROCESS_INFORMATION temp_process_info = {};
+  base::win::ScopedProcessInformation process_info;
   DWORD flags = CREATE_SUSPENDED;
 
   if (base::win::GetVersion() < base::win::VERSION_WIN8) {
     // Windows 8 implements nested jobs, but for older systems we need to
     // break out of any job we're in to enforce our restrictions.
     flags |= CREATE_BREAKAWAY_FROM_JOB;
   }
 
   if (!::CreateProcessAsUser(primary_token.Get(),
                              NULL,   // No application name.
                              command_line,
                              NULL,   // No security attribute.
                              NULL,   // No thread attribute.
                              FALSE,  // Do not inherit handles.
                              flags,
                              NULL,   // Use the environment of the caller.
                              NULL,   // Use current directory of the caller.
                              &startup_info,
-                             &temp_process_info)) {
+                             process_info.Receive())) {
     return ::GetLastError();
   }
-  base::win::ScopedProcessInformation process_info(temp_process_info);
 
   // Change the token of the main thread of the new process for the
   // impersonation token with more rights.
   {
     HANDLE temp_thread = process_info.thread_handle();
     if (!::SetThreadToken(&temp_thread, impersonation_token.Get())) {
       ::TerminateProcess(process_info.process_handle(),
                          0);  // exit code
       return ::GetLastError();
     }
@@ skipping 117 matching lines @@
   if (!::OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_DEFAULT,
                           &token_handle))
     return ::GetLastError();
 
   base::win::ScopedHandle token(token_handle);
 
   return SetTokenIntegrityLevel(token.Get(), integrity_level);
 }
 
 }  // namespace sandbox