Sandbox: Update the constructor of TargetProcess to receive ScopedHandles.

sandbox/win/src/target_process.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 "sandbox/win/src/target_process.h"
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/win/pe_image.h"
 #include "base/win/startup_information.h"
@@ skipping 47 matching lines @@
   }
   PIMAGE_NT_HEADERS nt_header = pe.GetNTHeaders();
   char* base = reinterpret_cast<char*>(entry_point) -
     nt_header->OptionalHeader.AddressOfEntryPoint;
 
   ::FreeLibrary(exe);
   return base;
 }
 
 
-TargetProcess::TargetProcess(HANDLE initial_token, HANDLE lockdown_token,
+TargetProcess::TargetProcess(base::win::ScopedHandle initial_token,
+                             base::win::ScopedHandle lockdown_token,
                              HANDLE job, ThreadProvider* thread_pool)
   // This object owns everything initialized here except thread_pool and
   // the job_ handle. The Job handle is closed by BrokerServices and results
   // eventually in a call to our dtor.
-    : lockdown_token_(lockdown_token),
-      initial_token_(initial_token),
+    : lockdown_token_(lockdown_token.Pass()),
+      initial_token_(initial_token.Pass()),
       job_(job),
       thread_pool_(thread_pool),
       base_address_(NULL) {
 }
 
 TargetProcess::~TargetProcess() {
   DWORD exit_code = 0;
   // Give a chance to the process to die. In most cases the JOB_KILL_ON_CLOSE
   // will take effect only when the context changes. As far as the testing went,
   // this wait was enough to switch context and kill the processes in the job.
@@ skipping 282 matching lines @@
 }
 
 void TargetProcess::Terminate() {
   if (!sandbox_process_info_.IsValid())
     return;
 
   ::TerminateProcess(sandbox_process_info_.process_handle(), 0);
 }
 
 TargetProcess* MakeTestTargetProcess(HANDLE process, HMODULE base_address) {
-  TargetProcess* target = new TargetProcess(NULL, NULL, NULL, NULL);
+  TargetProcess* target = new TargetProcess(base::win::ScopedHandle(),
+                                            base::win::ScopedHandle(),
+                                            NULL, NULL);
   PROCESS_INFORMATION process_info = {};
   process_info.hProcess = process;
   target->sandbox_process_info_.Set(process_info);
   target->base_address_ = base_address;
   return target;
 }
 
 }  // namespace sandbox