Index: base/win/scoped_process_information_unittest.cc |
diff --git a/base/win/scoped_process_information_unittest.cc b/base/win/scoped_process_information_unittest.cc |
index b8ffc4427c95aef7c326d21e6e9d358a0b79a22c..550076ef9c6db9d99b18292cbc4edeab48aa822c 100644 |
--- a/base/win/scoped_process_information_unittest.cc |
+++ b/base/win/scoped_process_information_unittest.cc |
@@ -19,11 +19,13 @@ const DWORD kThreadId = 1234; |
const HANDLE kProcessHandle = reinterpret_cast<HANDLE>(7651); |
const HANDLE kThreadHandle = reinterpret_cast<HANDLE>(1567); |
-void MockCreateProcess(PROCESS_INFORMATION* process_info) { |
- process_info->dwProcessId = kProcessId; |
- process_info->dwThreadId = kThreadId; |
- process_info->hProcess = kProcessHandle; |
- process_info->hThread = kThreadHandle; |
+void MockCreateProcess(base::win::ScopedProcessInformation* process_info) { |
+ PROCESS_INFORMATION process_information = {}; |
+ process_information.dwProcessId = kProcessId; |
+ process_information.dwThreadId = kThreadId; |
+ process_information.hProcess = kProcessHandle; |
+ process_information.hThread = kThreadHandle; |
+ process_info->Set(process_information); |
} |
} // namespace |
@@ -62,7 +64,7 @@ TEST_F(ScopedProcessInformationTest, InitiallyInvalid) { |
TEST_F(ScopedProcessInformationTest, Receive) { |
base::win::ScopedProcessInformation process_info; |
- MockCreateProcess(process_info.Receive()); |
+ MockCreateProcess(&process_info); |
EXPECT_TRUE(process_info.IsValid()); |
EXPECT_EQ(kProcessId, process_info.process_id()); |
@@ -74,7 +76,7 @@ TEST_F(ScopedProcessInformationTest, Receive) { |
TEST_F(ScopedProcessInformationTest, TakeProcess) { |
base::win::ScopedProcessInformation process_info; |
- MockCreateProcess(process_info.Receive()); |
+ MockCreateProcess(&process_info); |
HANDLE process = process_info.TakeProcessHandle(); |
EXPECT_EQ(kProcessHandle, process); |
@@ -86,7 +88,7 @@ TEST_F(ScopedProcessInformationTest, TakeProcess) { |
TEST_F(ScopedProcessInformationTest, TakeThread) { |
base::win::ScopedProcessInformation process_info; |
- MockCreateProcess(process_info.Receive()); |
+ MockCreateProcess(&process_info); |
HANDLE thread = process_info.TakeThreadHandle(); |
EXPECT_EQ(kThreadHandle, thread); |
@@ -98,7 +100,7 @@ TEST_F(ScopedProcessInformationTest, TakeThread) { |
TEST_F(ScopedProcessInformationTest, TakeBoth) { |
base::win::ScopedProcessInformation process_info; |
- MockCreateProcess(process_info.Receive()); |
+ MockCreateProcess(&process_info); |
HANDLE process = process_info.TakeProcessHandle(); |
HANDLE thread = process_info.TakeThreadHandle(); |
@@ -108,7 +110,7 @@ TEST_F(ScopedProcessInformationTest, TakeBoth) { |
TEST_F(ScopedProcessInformationTest, TakeWholeStruct) { |
base::win::ScopedProcessInformation process_info; |
- MockCreateProcess(process_info.Receive()); |
+ MockCreateProcess(&process_info); |
PROCESS_INFORMATION to_discard = process_info.Take(); |
EXPECT_EQ(kProcessId, to_discard.dwProcessId); |
@@ -119,8 +121,11 @@ TEST_F(ScopedProcessInformationTest, TakeWholeStruct) { |
} |
TEST_F(ScopedProcessInformationTest, Duplicate) { |
+ PROCESS_INFORMATION temp_process_information; |
+ DoCreateProcess("ReturnSeven", &temp_process_information); |
base::win::ScopedProcessInformation process_info; |
- DoCreateProcess("ReturnSeven", process_info.Receive()); |
+ process_info.Set(temp_process_information); |
+ |
base::win::ScopedProcessInformation duplicate; |
duplicate.DuplicateFrom(process_info); |
@@ -146,15 +151,17 @@ TEST_F(ScopedProcessInformationTest, Duplicate) { |
} |
TEST_F(ScopedProcessInformationTest, Set) { |
- PROCESS_INFORMATION base_process_info = {}; |
+ base::win::ScopedProcessInformation base_process_info; |
MockCreateProcess(&base_process_info); |
+ PROCESS_INFORMATION base_struct = base_process_info.Take(); |
+ |
base::win::ScopedProcessInformation process_info; |
- process_info.Set(base_process_info); |
+ process_info.Set(base_struct); |
EXPECT_EQ(kProcessId, process_info.process_id()); |
EXPECT_EQ(kThreadId, process_info.thread_id()); |
EXPECT_EQ(kProcessHandle, process_info.process_handle()); |
EXPECT_EQ(kThreadHandle, process_info.thread_handle()); |
- base_process_info = process_info.Take(); |
+ base_struct = process_info.Take(); |
} |