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

tools/profile_chrome/systrace_controller.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.
 
 import threading
 import zlib
 
 from profile_chrome import controllers
 from profile_chrome import util
 
@@ skipping 38 matching lines @@
   def PullTrace(self):
     self._thread.join()
     self._thread = None
     if self._trace_data:
       output_name = 'systrace-%s' % util.GetTraceTimestamp()
       with open(output_name, 'w') as out:
         out.write(self._trace_data)
       return output_name
 
   def _RunATraceCommand(self, command):
-    # TODO(jbudorick) can this be made work with DeviceUtils?
     # We use a separate interface to adb because the one from AndroidCommands
     # isn't re-entrant.
-    device_param = (['-s', self._device.old_interface.GetDevice()]
-                    if self._device.old_interface.GetDevice() else [])
+    # TODO(jbudorick) Look at providing a way to unhandroll this once the
+    #                 adb rewrite has fully landed.
+    device_param = (['-s', str(self._device)] if str(self._device) else [])
     cmd = ['adb'] + device_param + ['shell', 'atrace', '--%s' % command] + \
         _SYSTRACE_OPTIONS + self._categories
     return cmd_helper.GetCmdOutput(cmd)
 
   def _CollectData(self):
     trace_data = []
     self._RunATraceCommand('async_start')
     try:
       while not self._done.is_set():
         self._done.wait(_SYSTRACE_INTERVAL)
@@ skipping 12 matching lines @@
     except ValueError:
       raise RuntimeError('Systrace start marker not found')
     trace_data = trace_data[trace_start + 6:]
 
     # Collapse CRLFs that are added by adb shell.
     if trace_data.startswith('\r\n'):
       trace_data = trace_data.replace('\r\n', '\n')
 
     # Skip the initial newline.
     return trace_data[1:]