| Index: chrome/installer/util/delete_tree_work_item_unittest.cc
|
| diff --git a/chrome/installer/util/delete_tree_work_item_unittest.cc b/chrome/installer/util/delete_tree_work_item_unittest.cc
|
| index 239e098828134b08fe7631a9464537145139499e..537c6d155bcbbf372085b843c22efacb26b79017 100644
|
| --- a/chrome/installer/util/delete_tree_work_item_unittest.cc
|
| +++ b/chrome/installer/util/delete_tree_work_item_unittest.cc
|
| @@ -14,6 +14,7 @@
|
| #include "base/process_util.h"
|
| #include "base/scoped_temp_dir.h"
|
| #include "base/string_util.h"
|
| +#include "base/win/scoped_process_information.h"
|
| #include "chrome/installer/util/delete_tree_work_item.h"
|
| #include "chrome/installer/util/work_item.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -189,11 +190,11 @@ TEST_F(DeleteTreeWorkItemTest, DeleteTreeInUse) {
|
|
|
| // Run the key path file to keep it in use.
|
| STARTUPINFOW si = {sizeof(si)};
|
| - PROCESS_INFORMATION pi = {0};
|
| + base::win::ScopedProcessInformation pi;
|
| ASSERT_TRUE(
|
| ::CreateProcessW(NULL, const_cast<wchar_t*>(key_path.value().c_str()),
|
| NULL, NULL, FALSE, CREATE_NO_WINDOW | CREATE_SUSPENDED,
|
| - NULL, NULL, &si, &pi));
|
| + NULL, NULL, &si, pi.Receive()));
|
|
|
| // test Do().
|
| {
|
| @@ -214,7 +215,6 @@ TEST_F(DeleteTreeWorkItemTest, DeleteTreeInUse) {
|
| EXPECT_TRUE(file_util::PathExists(file_name_delete_1));
|
| EXPECT_TRUE(file_util::PathExists(file_name_delete_2));
|
|
|
| - TerminateProcess(pi.hProcess, 0);
|
| - // make sure the handle is closed.
|
| - WaitForSingleObject(pi.hProcess, INFINITE);
|
| + TerminateProcess(pi.Get().hProcess, 0);
|
| + WaitForSingleObject(pi.Get().hProcess, INFINITE);
|
| }
|
|
|