Revert 130716 - Use ScopedProcessInformation and other RAII types in sandbox.

sandbox/src/policy_target_test.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "base/win/scoped_process_information.h"
 #include "base/win/windows_version.h"
 #include "sandbox/src/sandbox.h"
 #include "sandbox/src/sandbox_factory.h"
 #include "sandbox/src/sandbox_utils.h"
 #include "sandbox/src/target_services.h"
 #include "sandbox/tests/common/controller.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace sandbox {
 
@@ skipping 127 matching lines @@
     return ::GetLastError();
 
   return SBOX_TEST_SUCCEEDED;
 }
 
 // Tests that we can call CreateProcess.
 SBOX_TESTS_COMMAND int PolicyTargetTest_process(int argc, wchar_t **argv) {
   // Use default values to create a new process.
   STARTUPINFO startup_info = {0};
   startup_info.cb = sizeof(startup_info);
-  base::win::ScopedProcessInformation process_info;
+  PROCESS_INFORMATION process_info;
   if (!::CreateProcessW(L"foo.exe", L"foo.exe", NULL, NULL, FALSE, 0,
-                        NULL, NULL, &startup_info, process_info.Receive()))
+                        NULL, NULL, &startup_info, &process_info))
     return SBOX_TEST_SUCCEEDED;
   return SBOX_TEST_FAILED;
 }
 
 TEST(PolicyTargetTest, SetInformationThread) {
   TestRunner runner;
   if (base::win::GetVersion() >= base::win::VERSION_XP) {
     runner.SetTestState(BEFORE_REVERT);
     EXPECT_EQ(SBOX_TEST_SUCCEEDED, runner.RunTest(L"PolicyTargetTest_token"));
   }
@@ skipping 61 matching lines @@
   // Get the path to the sandboxed app.
   wchar_t prog_name[MAX_PATH];
   GetModuleFileNameW(NULL, prog_name, MAX_PATH);
 
   std::wstring arguments(L"\"");
   arguments += prog_name;
   arguments += L"\" -child 0 wait";  // Don't care about the "state" argument.
 
   // Launch the app.
   ResultCode result = SBOX_ALL_OK;
-  base::win::ScopedProcessInformation target;
+  PROCESS_INFORMATION target = {0};
 
   TargetPolicy* policy = broker->CreatePolicy();
   policy->SetAlternateDesktop(false);
   policy->SetTokenLevel(USER_INTERACTIVE, USER_LOCKDOWN);
-  result = broker->SpawnTarget(
-      prog_name, arguments.c_str(), policy, target.Receive());
+  result = broker->SpawnTarget(prog_name, arguments.c_str(), policy, &target);
   policy->Release();
 
   EXPECT_EQ(SBOX_ALL_OK, result);
 
-  EXPECT_EQ(1, ::ResumeThread(target.thread_handle()));
+  EXPECT_EQ(1, ::ResumeThread(target.hThread));
 
-  EXPECT_EQ(WAIT_TIMEOUT, ::WaitForSingleObject(target.process_handle(), 2000));
+  EXPECT_EQ(WAIT_TIMEOUT, ::WaitForSingleObject(target.hProcess, 2000));
 
-  EXPECT_NE(::GetThreadDesktop(target.thread_id()),
+  EXPECT_NE(::GetThreadDesktop(target.dwThreadId),
             ::GetThreadDesktop(::GetCurrentThreadId()));
 
   std::wstring desktop_name = policy->GetAlternateDesktop();
   HDESK desk = ::OpenDesktop(desktop_name.c_str(), 0, FALSE, DESKTOP_ENUMERATE);
   EXPECT_TRUE(NULL != desk);
   EXPECT_TRUE(::CloseDesktop(desk));
-  EXPECT_TRUE(::TerminateProcess(target.process_handle(), 0));
+  EXPECT_TRUE(::TerminateProcess(target.hProcess, 0));
 
-  ::WaitForSingleObject(target.process_handle(), INFINITE);
+  ::WaitForSingleObject(target.hProcess, INFINITE);
+
+  EXPECT_TRUE(::CloseHandle(target.hProcess));
+  EXPECT_TRUE(::CloseHandle(target.hThread));
 
   // Close the desktop handle.
   temp_policy = broker->CreatePolicy();
   temp_policy->DestroyAlternateDesktop();
   temp_policy->Release();
 
   // Make sure the desktop does not exist anymore.
   desk = ::OpenDesktop(desktop_name.c_str(), 0, FALSE, DESKTOP_ENUMERATE);
   EXPECT_TRUE(NULL == desk);
 }
@@ skipping 15 matching lines @@
   // Get the path to the sandboxed app.
   wchar_t prog_name[MAX_PATH];
   GetModuleFileNameW(NULL, prog_name, MAX_PATH);
 
   std::wstring arguments(L"\"");
   arguments += prog_name;
   arguments += L"\" -child 0 wait";  // Don't care about the "state" argument.
 
   // Launch the app.
   ResultCode result = SBOX_ALL_OK;
-  base::win::ScopedProcessInformation target;
+  PROCESS_INFORMATION target = {0};
 
   TargetPolicy* policy = broker->CreatePolicy();
   policy->SetAlternateDesktop(true);
   policy->SetTokenLevel(USER_INTERACTIVE, USER_LOCKDOWN);
-  result = broker->SpawnTarget(
-      prog_name, arguments.c_str(), policy, target.Receive());
+  result = broker->SpawnTarget(prog_name, arguments.c_str(), policy, &target);
   policy->Release();
 
   EXPECT_EQ(SBOX_ALL_OK, result);
 
-  EXPECT_EQ(1, ::ResumeThread(target.thread_handle()));
+  EXPECT_EQ(1, ::ResumeThread(target.hThread));
 
-  EXPECT_EQ(WAIT_TIMEOUT, ::WaitForSingleObject(target.process_handle(), 2000));
+  EXPECT_EQ(WAIT_TIMEOUT, ::WaitForSingleObject(target.hProcess, 2000));
 
-  EXPECT_NE(::GetThreadDesktop(target.thread_id()),
+  EXPECT_NE(::GetThreadDesktop(target.dwThreadId),
             ::GetThreadDesktop(::GetCurrentThreadId()));
 
   std::wstring desktop_name = policy->GetAlternateDesktop();
   ASSERT_FALSE(desktop_name.empty());
 
   // Make sure there is a backslash, for the window station name.
   EXPECT_NE(desktop_name.find_first_of(L'\\'), std::wstring::npos);
 
   // Isolate the desktop name.
   desktop_name = desktop_name.substr(desktop_name.find_first_of(L'\\') + 1);
 
   HDESK desk = ::OpenDesktop(desktop_name.c_str(), 0, FALSE, DESKTOP_ENUMERATE);
   // This should fail if the desktop is really on another window station.
   EXPECT_FALSE(NULL != desk);
-  EXPECT_TRUE(::TerminateProcess(target.process_handle(), 0));
+  EXPECT_TRUE(::TerminateProcess(target.hProcess, 0));
 
-  ::WaitForSingleObject(target.process_handle(), INFINITE);
+  ::WaitForSingleObject(target.hProcess, INFINITE);
+
+  EXPECT_TRUE(::CloseHandle(target.hProcess));
+  EXPECT_TRUE(::CloseHandle(target.hThread));
 
   // Close the desktop handle.
   temp_policy = broker->CreatePolicy();
   temp_policy->DestroyAlternateDesktop();
   temp_policy->Release();
 }
 
 }  // namespace sandbox