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

build/android/pylib/gtest/test_package_exe.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.
 
 """Defines TestPackageExecutable to help run stand-alone executables."""
 
 import logging
 import os
 import sys
 import tempfile
@@ skipping 105 matching lines @@
   def GetAllTests(self, device):
     all_tests = device.RunShellCommand(
         '%s %s/%s --gtest_list_tests' %
         (self.tool.GetTestWrapper(),
          constants.TEST_EXECUTABLE_DIR,
          self.suite_name))
     return self._ParseGTestListTests(all_tests)
 
   #override
   def SpawnTestProcess(self, device):
-    args = ['adb', '-s', device.old_interface.GetDevice(), 'shell', 'sh',
+    args = ['adb', '-s', str(device), 'shell', 'sh',
             constants.TEST_EXECUTABLE_DIR + '/chrome_test_runner.sh']
     logging.info(args)
     return pexpect.spawn(args[0], args[1:], logfile=sys.stdout)
 
   #override
   def Install(self, device):
     if self.tool.NeedsDebugInfo():
       target_name = self.suite_path
     else:
       target_name = self.suite_path + '_stripped'
       if not os.path.isfile(target_name):
         raise Exception('Did not find %s, build target %s' %
                         (target_name, self.suite_name + '_stripped'))
 
       target_mtime = os.stat(target_name).st_mtime
       source_mtime = os.stat(self.suite_path).st_mtime
       if target_mtime < source_mtime:
         raise Exception(
             'stripped binary (%s, timestamp %d) older than '
             'source binary (%s, timestamp %d), build target %s' %
             (target_name, target_mtime, self.suite_path, source_mtime,
              self.suite_name + '_stripped'))
 
     test_binary = constants.TEST_EXECUTABLE_DIR + '/' + self.suite_name
     device.PushChangedFiles(target_name, test_binary)