[Android] Change object types from AndroidCommands to DeviceUtils in build/android/.

build/android/pylib/ports.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.
 
 """Functions that deal with local and device ports."""
 
 import contextlib
 import fcntl
 import httplib
 import logging
@@ skipping 83 matching lines @@
   port_info = '(\*)|(127\.0\.0\.1)|(localhost):%d' % host_port
   # TODO(jnd): Find a better way to filter the port. Note that connecting to the
   # socket and closing it would leave it in the TIME_WAIT state. Setting
   # SO_LINGER on it and then closing it makes the Python HTTP server crash.
   re_port = re.compile(port_info, re.MULTILINE)
   if re_port.search(cmd_helper.GetCmdOutput(['lsof', '-nPi:%d' % host_port])):
     return True
   return False
 
 
-def IsDevicePortUsed(adb, device_port, state=''):
+def IsDevicePortUsed(device, device_port, state=''):
   """Checks whether the specified device port is used or not.
 
   Args:
-    adb: Instance of AndroidCommands for talking to the device.
+    device: A DeviceUtils instance.
     device_port: Port on device we want to check.
     state: String of the specified state. Default is empty string, which
            means any state.
 
   Returns:
     True if the port on device is already used, otherwise returns False.
   """
   base_url = '127.0.0.1:%d' % device_port
-  netstat_results = adb.RunShellCommand('netstat', log_result=False)
+  netstat_results = device.old_interface.RunShellCommand(
+      'netstat', log_result=False)
   for single_connect in netstat_results:
     # Column 3 is the local address which we want to check with.
     connect_results = single_connect.split()
     if connect_results[0] != 'tcp':
       continue
     if len(connect_results) < 6:
       raise Exception('Unexpected format while parsing netstat line: ' +
                       single_connect)
     is_state_match = connect_results[5] == state if state else True
     if connect_results[3] == base_url and is_state_match:
@@ skipping 39 matching lines @@
         client_error = ('Bad response: %s %s version %s\n  ' %
                         (r.status, r.reason, r.version) +
                         '\n  '.join([': '.join(h) for h in r.getheaders()]))
     except (httplib.HTTPException, socket.error) as e:
       # Probably too quick connecting: try again.
       exception_error_msgs = traceback.format_exception_only(type(e), e)
       if exception_error_msgs:
         client_error = ''.join(exception_error_msgs)
   # Only returns last client_error.
   return (False, client_error or 'Timeout')