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

build/android/pylib/screenshot.py

 # Copyright 2013 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 os
 import signal
 import tempfile
 
 from pylib import cmd_helper
 
@@ skipping 20 matching lines @@
     if isinstance(device, pylib.android_commands.AndroidCommands):
       device = pylib.device.device_utils.DeviceUtils(device)
     self._device = device
     self._device_file = (
         '%s/screen-recording.mp4' % device.GetExternalStoragePath())
     self._recorder = None
     self._recorder_stdout = None
     self._is_started = False
 
     self._args = ['adb']
-    if self._device.old_interface.GetDevice():
-      self._args += ['-s', self._device.old_interface.GetDevice()]
+    if str(self._device):
+      self._args += ['-s', str(self._device)]
     self._args += ['shell', 'screenrecord', '--verbose']
     self._args += ['--bit-rate', str(megabits_per_second * 1000 * 1000)]
     if size:
       self._args += ['--size', '%dx%d' % size]
     if rotate:
       self._args += ['--rotate']
     self._args += [self._device_file]
 
   def Start(self):
     """Start recording video."""
@@ skipping 29 matching lines @@
     Returns:
       Output video file name on the host.
     """
     host_file_name = host_file or ('screen-recording-%s.mp4' %
                                    self._device.old_interface.GetTimestamp())
     host_file_name = os.path.abspath(host_file_name)
     self._device.old_interface.EnsureHostDirectory(host_file_name)
     self._device.PullFile(self._device_file, host_file_name)
     self._device.RunShellCommand('rm -f "%s"' % self._device_file)
     return host_file_name