Reland of Migrate DeviceUtils.ReadFile to adb_wrapper

build/android/pylib/perf/thermal_throttle.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 logging
 from pylib import android_commands
 from pylib.device import device_utils
 
 
 class OmapThrottlingDetector(object):
@@ skipping 16 matching lines @@
   def BecameUnthrottled(log_line):
     return 'omap_thermal_unthrottle' in log_line
 
   @staticmethod
   def GetThrottlingTemperature(log_line):
     if 'throttle_delayed_work_fn' in log_line:
       return float([s for s in log_line.split() if s.isdigit()][0]) / 1000.0
 
   def GetCurrentTemperature(self):
     tempdata = self._device.ReadFile(OmapThrottlingDetector.OMAP_TEMP_FILE)
-    return float(tempdata[0]) / 1000.0
+    return float(tempdata) / 1000.0
 
 
 class ExynosThrottlingDetector(object):
   """Class to detect and track thermal throttling on an Exynos 5."""
   @staticmethod
   def IsSupported(device):
     return device.FileExists('/sys/bus/exynos5-core')
 
   def __init__(self, device):
     pass
@@ skipping 80 matching lines @@
       # Print temperature of battery, to give a system temperature
       dumpsys_log = self._device.RunShellCommand('dumpsys battery')
       for line in dumpsys_log:
         if 'temperature' in line:
           btemp = float([s for s in line.split() if s.isdigit()][0]) / 10.0
           logging.debug(u'Current battery temperature of %s = %3.1f%sC',
                         serial_number, btemp, degree_symbol)
 
     return has_been_throttled