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

sandbox/win/src/policy_target_test.cc

Index: sandbox/win/src/policy_target_test.cc
===================================================================
--- sandbox/win/src/policy_target_test.cc	(revision 237598)
+++ sandbox/win/src/policy_target_test.cc	(working copy)
@@ -150,11 +150,10 @@
   // Use default values to create a new process.
   STARTUPINFO startup_info = {0};
   startup_info.cb = sizeof(startup_info);
-  PROCESS_INFORMATION temp_process_info = {};
+  base::win::ScopedProcessInformation process_info;
   if (!::CreateProcessW(L"foo.exe", L"foo.exe", NULL, NULL, FALSE, 0,
-                        NULL, NULL, &startup_info, &temp_process_info))
+                        NULL, NULL, &startup_info, process_info.Receive()))
     return SBOX_TEST_SUCCEEDED;
-  base::win::ScopedProcessInformation process_info(temp_process_info);
   return SBOX_TEST_FAILED;
 }
 
@@ -240,14 +239,11 @@
   TargetPolicy* policy = broker->CreatePolicy();
   policy->SetAlternateDesktop(false);
   policy->SetTokenLevel(USER_INTERACTIVE, USER_LOCKDOWN);
-  PROCESS_INFORMATION temp_process_info = {};
   result = broker->SpawnTarget(prog_name, arguments.c_str(), policy,
-                               &temp_process_info);
+                               target.Receive());
   policy->Release();
 
   EXPECT_EQ(SBOX_ALL_OK, result);
-  if (result == SBOX_ALL_OK)
-    target.Set(temp_process_info);
 
   EXPECT_EQ(1, ::ResumeThread(target.thread_handle()));
 
@@ -303,14 +299,11 @@
   TargetPolicy* policy = broker->CreatePolicy();
   policy->SetAlternateDesktop(true);
   policy->SetTokenLevel(USER_INTERACTIVE, USER_LOCKDOWN);
-  PROCESS_INFORMATION temp_process_info = {};
   result = broker->SpawnTarget(prog_name, arguments.c_str(), policy,
-                               &temp_process_info);
+                               target.Receive());
   policy->Release();
 
   EXPECT_EQ(SBOX_ALL_OK, result);
-  if (result == SBOX_ALL_OK)
-    target.Set(temp_process_info);
 
   EXPECT_EQ(1, ::ResumeThread(target.thread_handle()));