[Android] Switch to DeviceUtils versions of GetMemoryUsageForPid and __str__.

build/android/pylib/device/device_utils.py

 # Copyright 2014 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 a variety of device interactions based on adb.
 
 Eventually, this will be based on adb_wrapper.
 """
 # pylint: disable=W0613
 
@@ skipping 707 matching lines @@
       timeout: timeout in seconds
       retries: number of retries
     Returns:
       A dict containing |num_reads|, |num_writes|, |read_ms|, and |write_ms|.
     Raises:
       CommandTimeoutError on timeout.
       DeviceUnreachableError on missing device.
     """
     return self.old_interface.GetIoStats()
 
+  @decorators.WithTimeoutAndRetriesFromInstance()
+  def GetMemoryUsageForPid(self, pid, timeout=None, retries=None):
+    """Gets the memory usage for the given PID.
+
+    Args:
+      pid: An integer containing the PID to get the memory usage for.

[frankf, 2014/07/23 16:39:44]

you can shorten this to : "PID of the process"

[jbudorick, 2014/07/23 18:09:44]

Done.

+      timeout: timeout in seconds
+      retries: number of retries
+    Returns:

[tonyg, 2014/07/21 16:02:09]

You should keep it this way in this patch for consistency with the rest of the
file, but just an FYI that the style guide wants there to be an extra line break
between these sections of the doc strings.

http://google-styleguide.googlecode.com/svn/trunk/pyguide.html#Comments

[jbudorick, 2014/07/23 18:09:43]

Changed throughout the file.

+      A 2-tuple containing:
+        - A dict containing the overall memory usage statistics for the PID.
+        - A dict containing memory usage statistics broken down by mapping.
+    Raises:
+      CommandTimeoutError on timeout.
+    """
+    return self.old_interface.GetMemoryUsageForPid(pid)
+
   def __str__(self):
     """Returns the device serial."""
     return self.old_interface.GetDevice()
 
   @staticmethod
   def parallel(devices=None, async=False):
     """Creates a Parallelizer to operate over the provided list of devices.
 
     If |devices| is either |None| or an empty list, the Parallelizer will
     operate over all attached devices.
 
     Args:
       devices: A list of either DeviceUtils instances or objects from
                from which DeviceUtils instances can be constructed. If None,
                all attached devices will be used.
       async: If true, returns a Parallelizer that runs operations
              asynchronously.
     Returns:
       A Parallelizer operating over |devices|.
     """
     if not devices or len(devices) == 0:
       devices = pylib.android_commands.GetAttachedDevices()
     parallelizer_type = (parallelizer.Parallelizer if async
                          else parallelizer.SyncParallelizer)
     return parallelizer_type([
         d if isinstance(d, DeviceUtils) else DeviceUtils(d)
         for d in devices])