[Android] Change object types from AndroidCommands to DeviceUtils everywhere else.

tools/android/memdump/memreport.py

 #!/usr/bin/env python
 #
 # Copyright (c) 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 collections
 import json
 import optparse
 import os
 import re
 import threading
 import time
 import sys
 
 from sets import Set
 from string import Template
 
 sys.path.append(os.path.join(sys.path[0], os.pardir, os.pardir, os.pardir,
                              'build','android'))
-from pylib import android_commands
 from pylib import constants
+from pylib.device import device_utils
 
 
 _ENTRIES = [
     ('Total', '.* r... '),
     ('Read-only', '.* r--. '),
     ('Read-write', '.* rw.. '),
     ('Executable', '.* ..x. '),
     ('Anonymous total', '.* ""'),
     ('Anonymous read-write', '.* rw.. .* ""'),
     ('Anonymous executable (JIT\'ed code)', '.* ..x. .* ""'),
@@ skipping 165 matching lines @@
                            all_pids[p] for p in pids
                          ]))
     print Template(_HTML_TEMPLATE).safe_substitute({
         'JSON_PIDS': json.dumps(pids),
         'JSON_PIDS_INFO': json.dumps(pids_info)
     })
 
 
 
   def _CollectStats(count):
-    adb = android_commands.AndroidCommands()
-    pid_list = adb.ExtractPid(package_name)
-    memdump = adb.RunShellCommand('/data/local/tmp/memdump ' +
-                                  ' '.join(pid_list))
+    device = device_utils.DeviceUtils()
+    pid_list = device.old_interface.ExtractPid(package_name)
+    memdump = device.old_interface.RunShellCommand(
+        '/data/local/tmp/memdump ' + ' '.join(pid_list))
     process_stats = _CollectMemoryStats(memdump,
                                         [value for (key, value) in _ENTRIES])
     for (pid, process) in zip(pid_list, process_stats):
       first_pid_entry = True
       for (k, v) in _ENTRIES:
         if v not in process:
           continue
         for area_type in _AREA_TYPES:
           legend = k + '_' + area_type
           if pid not in all_pids:
@@ skipping 47 matching lines @@
                     type='int',
                     help='Interval in seconds for manual collections.')
   options, args = parser.parse_args(argv)
   if options.manual_graph:
     return _RunManualGraph(options.package, options.interval)
   _DumpCSV(_CollectMemoryStats(sys.stdin, [value for (key, value) in _ENTRIES]))
 
 
 if __name__ == '__main__':
   main(sys.argv)