Index: util/win/process_info_test.cc |
diff --git a/util/win/process_info_test.cc b/util/win/process_info_test.cc |
index e5bde2f6ae795fc036f5f6e76916daf4c88d1e7c..6917ed9eaec56f97031a0e13f540d3aeebd54c7d 100644 |
--- a/util/win/process_info_test.cc |
+++ b/util/win/process_info_test.cc |
@@ -59,7 +59,7 @@ void VerifyAddressInInCodePage(const ProcessInfo& process_info, |
WinVMAddress code_address) { |
// Make sure the child code address is an code page address with the right |
// information. |
- const std::vector<MEMORY_BASIC_INFORMATION64>& memory_info = |
+ const ProcessInfo::MemoryBasicInformation64Vector& memory_info = |
process_info.MemoryInfo(); |
bool found_region = false; |
for (const auto& mi : memory_info) { |
@@ -199,7 +199,7 @@ TEST(ProcessInfo, OtherProcessWOW64) { |
#endif // ARCH_CPU_64_BITS |
TEST(ProcessInfo, AccessibleRangesNone) { |
- std::vector<MEMORY_BASIC_INFORMATION64> memory_info; |
+ ProcessInfo::MemoryBasicInformation64Vector memory_info; |
MEMORY_BASIC_INFORMATION64 mbi = {0}; |
mbi.BaseAddress = 0; |
@@ -215,7 +215,7 @@ TEST(ProcessInfo, AccessibleRangesNone) { |
} |
TEST(ProcessInfo, AccessibleRangesOneInside) { |
- std::vector<MEMORY_BASIC_INFORMATION64> memory_info; |
+ ProcessInfo::MemoryBasicInformation64Vector memory_info; |
MEMORY_BASIC_INFORMATION64 mbi = {0}; |
mbi.BaseAddress = 0; |
@@ -233,7 +233,7 @@ TEST(ProcessInfo, AccessibleRangesOneInside) { |
} |
TEST(ProcessInfo, AccessibleRangesOneTruncatedSize) { |
- std::vector<MEMORY_BASIC_INFORMATION64> memory_info; |
+ ProcessInfo::MemoryBasicInformation64Vector memory_info; |
MEMORY_BASIC_INFORMATION64 mbi = {0}; |
mbi.BaseAddress = 0; |
@@ -256,7 +256,7 @@ TEST(ProcessInfo, AccessibleRangesOneTruncatedSize) { |
} |
TEST(ProcessInfo, AccessibleRangesOneMovedStart) { |
- std::vector<MEMORY_BASIC_INFORMATION64> memory_info; |
+ ProcessInfo::MemoryBasicInformation64Vector memory_info; |
MEMORY_BASIC_INFORMATION64 mbi = {0}; |
mbi.BaseAddress = 0; |
@@ -279,7 +279,7 @@ TEST(ProcessInfo, AccessibleRangesOneMovedStart) { |
} |
TEST(ProcessInfo, ReserveIsInaccessible) { |
- std::vector<MEMORY_BASIC_INFORMATION64> memory_info; |
+ ProcessInfo::MemoryBasicInformation64Vector memory_info; |
MEMORY_BASIC_INFORMATION64 mbi = {0}; |
mbi.BaseAddress = 0; |
@@ -302,7 +302,7 @@ TEST(ProcessInfo, ReserveIsInaccessible) { |
} |
TEST(ProcessInfo, PageGuardIsInaccessible) { |
- std::vector<MEMORY_BASIC_INFORMATION64> memory_info; |
+ ProcessInfo::MemoryBasicInformation64Vector memory_info; |
MEMORY_BASIC_INFORMATION64 mbi = {0}; |
mbi.BaseAddress = 0; |
@@ -327,7 +327,7 @@ TEST(ProcessInfo, PageGuardIsInaccessible) { |
} |
TEST(ProcessInfo, PageNoAccessIsInaccessible) { |
- std::vector<MEMORY_BASIC_INFORMATION64> memory_info; |
+ ProcessInfo::MemoryBasicInformation64Vector memory_info; |
MEMORY_BASIC_INFORMATION64 mbi = {0}; |
mbi.BaseAddress = 0; |
@@ -352,7 +352,7 @@ TEST(ProcessInfo, PageNoAccessIsInaccessible) { |
} |
TEST(ProcessInfo, AccessibleRangesCoalesced) { |
- std::vector<MEMORY_BASIC_INFORMATION64> memory_info; |
+ ProcessInfo::MemoryBasicInformation64Vector memory_info; |
MEMORY_BASIC_INFORMATION64 mbi = {0}; |
mbi.BaseAddress = 0; |
@@ -380,7 +380,7 @@ TEST(ProcessInfo, AccessibleRangesCoalesced) { |
} |
TEST(ProcessInfo, AccessibleRangesMiddleUnavailable) { |
- std::vector<MEMORY_BASIC_INFORMATION64> memory_info; |
+ ProcessInfo::MemoryBasicInformation64Vector memory_info; |
MEMORY_BASIC_INFORMATION64 mbi = {0}; |
mbi.BaseAddress = 0; |
@@ -410,7 +410,7 @@ TEST(ProcessInfo, AccessibleRangesMiddleUnavailable) { |
} |
TEST(ProcessInfo, RequestedBeforeMap) { |
- std::vector<MEMORY_BASIC_INFORMATION64> memory_info; |
+ ProcessInfo::MemoryBasicInformation64Vector memory_info; |
MEMORY_BASIC_INFORMATION64 mbi = {0}; |
mbi.BaseAddress = 10; |
@@ -428,7 +428,7 @@ TEST(ProcessInfo, RequestedBeforeMap) { |
} |
TEST(ProcessInfo, RequestedAfterMap) { |
- std::vector<MEMORY_BASIC_INFORMATION64> memory_info; |
+ ProcessInfo::MemoryBasicInformation64Vector memory_info; |
MEMORY_BASIC_INFORMATION64 mbi = {0}; |
mbi.BaseAddress = 10; |