Android: follow up on crrev.com/270395

build/android/pylib/android_commands.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Provides an interface to communicate with the device via the adb command.
 
 Assumes adb binary is currently on system path.
 """
 # pylint: disable-all
 
@@ skipping 1620 matching lines @@
       Shared_Dirty, Private_Clean, Private_Dirty, VmHWM.
     """
     showmap = self.RunShellCommand('showmap %d' % pid)
     if not showmap or not showmap[-1].endswith('TOTAL'):
       logging.warning('Invalid output for showmap %s', str(showmap))
       return {}
     items = showmap[-1].split()
     if len(items) != 9:
       logging.warning('Invalid TOTAL for showmap %s', str(items))
       return {}
-    usage_dict = collections.defaultdict(int)
-    usage_dict.update({
+    usage_dict = {
         'Size': int(items[0].strip()),
         'Rss': int(items[1].strip()),
         'Pss': int(items[2].strip()),
         'Shared_Clean': int(items[3].strip()),
         'Shared_Dirty': int(items[4].strip()),
         'Private_Clean': int(items[5].strip()),
         'Private_Dirty': int(items[6].strip()),
-    })
-    peak_value_kb = 0
+    }
     for line in self.GetProtectedFileContents('/proc/%s/status' % pid):
       if not line.startswith('VmHWM:'):  # Format: 'VmHWM: +[0-9]+ kB'
         continue
-      peak_value_kb = int(line.split(':')[1].strip().split(' ')[0])
+      usage_dict['VmHWM'] = int(line.split(':')[1].strip().split(' ')[0])
       break
-    usage_dict['VmHWM'] = peak_value_kb
-    if not peak_value_kb:
+    else:
       logging.warning('Could not find memory peak value for pid ' + str(pid))
+      usage_dict['VmHWM'] = 0
 
     return usage_dict
 
   def ProcessesUsingDevicePort(self, device_port):
     """Lists processes using the specified device port on loopback interface.
 
     Args:
       device_port: Port on device we want to check.
 
     Returns:
@@ skipping 290 matching lines @@
   """
   def __init__(self, output):
     self._output = output
 
   def write(self, data):
     data = data.replace('\r\r\n', '\n')
     self._output.write(data)
 
   def flush(self):
     self._output.flush()