Index: sandbox/win/src/handle_closer_agent.cc |
diff --git a/sandbox/win/src/handle_closer_agent.cc b/sandbox/win/src/handle_closer_agent.cc |
index bc75e7322b2bf1a8c884196df569d530193ebd75..97dfb17efe4c71621e3289d8a228dfbec199003d 100644 |
--- a/sandbox/win/src/handle_closer_agent.cc |
+++ b/sandbox/win/src/handle_closer_agent.cc |
@@ -49,9 +49,9 @@ void HandleCloserAgent::InitializeHandlesToClose() { |
HandleListEntry* entry = g_handles_to_close->handle_entries; |
for (size_t i = 0; i < g_handles_to_close->num_handle_types; ++i) { |
// Set the type name. |
- char16* input = entry->handle_type; |
+ base::char16* input = entry->handle_type; |
HandleMap::mapped_type& handle_names = handles_to_close_[input]; |
- input = reinterpret_cast<char16*>(reinterpret_cast<char*>(entry) |
+ input = reinterpret_cast<base::char16*>(reinterpret_cast<char*>(entry) |
+ entry->offset_to_names); |
// Grab all the handle names. |
for (size_t j = 0; j < entry->name_count; ++j) { |
@@ -65,9 +65,9 @@ void HandleCloserAgent::InitializeHandlesToClose() { |
entry = reinterpret_cast<HandleListEntry*>(reinterpret_cast<char*>(entry) |
+ entry->record_bytes); |
- DCHECK(reinterpret_cast<char16*>(entry) >= input); |
- DCHECK(reinterpret_cast<char16*>(entry) - input < |
- sizeof(size_t) / sizeof(char16)); |
+ DCHECK(reinterpret_cast<base::char16*>(entry) >= input); |
+ DCHECK(reinterpret_cast<base::char16*>(entry) - input < |
+ sizeof(size_t) / sizeof(base::char16)); |
} |
// Clean up the memory we copied over. |