Index: tools/android/memdump/memdump.cc |
diff --git a/tools/android/memdump/memdump.cc b/tools/android/memdump/memdump.cc |
index 5ff459e4b5c25a2699bb16b91c861f1b6e080f46..2727157657023a5edd6fceca04ec0fa3a0dc7441 100644 |
--- a/tools/android/memdump/memdump.cc |
+++ b/tools/android/memdump/memdump.cc |
@@ -130,13 +130,13 @@ typedef base::hash_map<uint64, int> PFNMap; |
bool ParseMemoryMapLine(const std::string& line, |
std::vector<std::string>* tokens, |
MemoryMap* memory_map) { |
- tokens->clear(); |
- base::SplitString(line, ' ', tokens); |
+ *tokens = base::SplitString( |
+ line, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); |
if (tokens->size() < 2) |
return false; |
const std::string& addr_range = tokens->at(0); |
- std::vector<std::string> range_tokens; |
- base::SplitString(addr_range, '-', &range_tokens); |
+ std::vector<std::string> range_tokens = base::SplitString( |
+ addr_range, "-", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); |
const std::string& start_address_token = range_tokens.at(0); |
if (!base::HexStringToUInt64(start_address_token, |
&memory_map->start_address)) { |