| Index: base/process/process_util_unittest.cc
|
| diff --git a/base/process/process_util_unittest.cc b/base/process/process_util_unittest.cc
|
| index d846d1acfae2634c4aff68f1498b21eaac1b45f8..81e092f7cd422c1210ce6c0c0cb750988a8168d8 100644
|
| --- a/base/process/process_util_unittest.cc
|
| +++ b/base/process/process_util_unittest.cc
|
| @@ -876,14 +876,14 @@ bool IsProcessDead(base::ProcessHandle child) {
|
| }
|
|
|
| TEST_F(ProcessUtilTest, DelayedTermination) {
|
| - base::ProcessHandle child_process = SpawnChild("process_util_test_never_die");
|
| - ASSERT_TRUE(child_process);
|
| - base::EnsureProcessTerminated(child_process);
|
| - base::WaitForSingleProcess(child_process, base::TimeDelta::FromSeconds(5));
|
| + base::Process child_process(SpawnChild("process_util_test_never_die"));
|
| + ASSERT_TRUE(child_process.IsValid());
|
| + base::EnsureProcessTerminated(child_process.Duplicate());
|
| + base::WaitForSingleProcess(child_process.Handle(),
|
| + base::TimeDelta::FromSeconds(5));
|
|
|
| // Check that process was really killed.
|
| - EXPECT_TRUE(IsProcessDead(child_process));
|
| - base::CloseProcessHandle(child_process);
|
| + EXPECT_TRUE(IsProcessDead(child_process.Handle()));
|
| }
|
|
|
| MULTIPROCESS_TEST_MAIN(process_util_test_never_die) {
|
| @@ -894,16 +894,14 @@ MULTIPROCESS_TEST_MAIN(process_util_test_never_die) {
|
| }
|
|
|
| TEST_F(ProcessUtilTest, ImmediateTermination) {
|
| - base::ProcessHandle child_process =
|
| - SpawnChild("process_util_test_die_immediately");
|
| - ASSERT_TRUE(child_process);
|
| + base::Process child_process(SpawnChild("process_util_test_die_immediately"));
|
| + ASSERT_TRUE(child_process.IsValid());
|
| // Give it time to die.
|
| sleep(2);
|
| - base::EnsureProcessTerminated(child_process);
|
| + base::EnsureProcessTerminated(child_process.Duplicate());
|
|
|
| // Check that process was really killed.
|
| - EXPECT_TRUE(IsProcessDead(child_process));
|
| - base::CloseProcessHandle(child_process);
|
| + EXPECT_TRUE(IsProcessDead(child_process.Handle()));
|
| }
|
|
|
| MULTIPROCESS_TEST_MAIN(process_util_test_die_immediately) {
|
|
|