[Android] Switch to DeviceUtils versions of file functions.

tools/telemetry/telemetry/core/forwarders/android_forwarder.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 logging
 import os
 import re
 import socket
 import struct
 import subprocess
@@ skipping 158 matching lines @@
 
     assert self._IsRndisSupported(), 'Device does not support RNDIS.'
     self._CheckConfigureNetwork()
 
   @property
   def host_ip(self):
     return self._host_ip
 
   def _IsRndisSupported(self):
     """Checks that the device has RNDIS support in the kernel."""
-    return self._device.old_interface.FileExistsOnDevice(
-        '%s/f_rndis/device' % self._RNDIS_DEVICE)
+    return self._device.FileExists('%s/f_rndis/device' % self._RNDIS_DEVICE)
 
   def _WaitForDevice(self):
     self._device.old_interface.Adb().SendCommand('wait-for-device')
 
   def _FindDeviceRndisInterface(self):
     """Returns the name of the RNDIS network interface if present."""
     config = self._device.RunShellCommand('netcfg')
     interfaces = [line.split()[0] for line in config]
     candidates = [iface for iface in interfaces if re.match('rndis|usb', iface)]
     if candidates:
       assert len(candidates) == 1, 'Found more than one rndis device!'
       return candidates[0]
 
   def _EnumerateHostInterfaces(self):
     host_platform = platform.GetHostPlatform().GetOSName()
     if host_platform == 'linux':
       return subprocess.check_output(['ip', 'addr']).splitlines()
     if host_platform == 'mac':
       return subprocess.check_output(['ifconfig']).splitlines()
     raise NotImplementedError('Platform %s not supported!' % host_platform)
 
   def _FindHostRndisInterface(self):
     """Returns the name of the host-side network interface."""
     interface_list = self._EnumerateHostInterfaces()
-    ether_address = self._device.old_interface.GetFileContents(
+    ether_address = self._device.ReadFile(
         '%s/f_rndis/ethaddr' % self._RNDIS_DEVICE)[0]
     interface_name = None
     for line in interface_list:
       if not line.startswith((' ', '\t')):
         interface_name = line.split(':')[-2].strip()
       elif ether_address in line:
         return interface_name
 
   def _WriteProtectedFile(self, path, contents):
     subprocess.check_call(
@@ skipping 32 matching lines @@
   # For some combinations of devices and host kernels, adb won't work unless the
   # interface is up, but if we bring it up immediately, it will break adb.
   #sleep 1
   #ifconfig rndis0 192.168.42.2 netmask 255.255.255.0 up
   echo DONE >> %(prefix)s.log
 }
 
 doit &
     """ % {'dev': self._RNDIS_DEVICE, 'functions': 'rndis,adb',
            'prefix': script_prefix }
-    self._device.old_interface.SetFileContents('%s.sh' % script_prefix, script)
+    self._device.WriteFile('%s.sh' % script_prefix, script)
     # TODO(szym): run via su -c if necessary.
     self._device.RunShellCommand('rm %s.log' % script_prefix)
     self._device.RunShellCommand('. %s.sh' % script_prefix)
     self._WaitForDevice()
-    result = self._device.old_interface.GetFileContents(
-        '%s.log' % script_prefix)
+    result = self._device.ReadFile('%s.log' % script_prefix)
     assert any('DONE' in line for line in result), 'RNDIS script did not run!'
 
   def _CheckEnableRndis(self, force):
     """Enables the RNDIS network interface, retrying if necessary.
     Args:
       force: Disable RNDIS first, even if it appears already enabled.
     Returns:
       device_iface: RNDIS interface name on the device
       host_iface: corresponding interface name on the host
     """
@@ skipping 163 matching lines @@
   def _CheckConfigureNetwork(self):
     """Enables RNDIS and configures it, retrying until we have connectivity."""
     force = False
     for _ in range(3):
       device_iface, host_iface = self._CheckEnableRndis(force)
       self._ConfigureNetwork(device_iface, host_iface)
       if self._TestConnectivity():
         return
       force = True
     raise Exception('No connectivity, giving up.')