Revert of Improve readability of power monitoring code and add additional

tools/telemetry/telemetry/internal/platform/power_monitor/android_fuelgauge_power_monitor.py

Index: tools/telemetry/telemetry/internal/platform/power_monitor/android_fuelgauge_power_monitor.py
diff --git a/tools/telemetry/telemetry/internal/platform/power_monitor/android_fuelgauge_power_monitor.py b/tools/telemetry/telemetry/internal/platform/power_monitor/android_fuelgauge_power_monitor.py
index 0e7fe306276c0f15ee103ec881bbc4f235f682c4..8b219e0004380fb658ae6db040016b6300b77a2a 100644
--- a/tools/telemetry/telemetry/internal/platform/power_monitor/android_fuelgauge_power_monitor.py
+++ b/tools/telemetry/telemetry/internal/platform/power_monitor/android_fuelgauge_power_monitor.py
@@ -2,10 +2,12 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-from telemetry.internal.platform.power_monitor import android_power_monitor_base
+import logging
+
+from telemetry.internal.platform import power_monitor
 
 
-class FuelGaugePowerMonitor(android_power_monitor_base.AndroidPowerMonitorBase):
+class FuelGaugePowerMonitor(power_monitor.PowerMonitor):
   """PowerMonitor that relies on the fuel gauge chips to monitor the power
   consumption of a android device.
   """
@@ -24,21 +26,30 @@
     return self._battery.SupportsFuelGauge()
 
   def StartMonitoringPower(self, browser):
-    self._CheckStart()
-    self._ChargingOff(self._battery)
+    self._battery.SetCharging(False)
     self._starting_fuel_gauge = self._battery.GetFuelGaugeChargeCounter()
 
   def StopMonitoringPower(self):
-    self._CheckStop()
     # Convert from nAh to mAh.
     fuel_gauge_delta = (
         float((self._starting_fuel_gauge) -
         self._battery.GetFuelGaugeChargeCounter()) / 1000000)
-    self._ChargingOn(self._battery)
-    voltage = self._ParseVoltage(self._battery.GetBatteryInfo().get('voltage'))
+    self._battery.SetCharging(True)
+
+    voltage = self._battery.GetBatteryInfo().get('voltage')
+    if voltage is None:
+      # Converting at a nominal voltage of 4.0V, as those values are obtained by
+      # a heuristic, and 4.0V is the voltage we set when using a monsoon device.
+      voltage = 4.0
+      logging.warning('Unable to get device voltage. Using %s.', voltage)
+    else:
+      voltage = float(voltage) / 1000
+
     return self.ProcessPowerData(voltage, fuel_gauge_delta)
 
   @staticmethod
   def ProcessPowerData(voltage, fuel_gauge_delta):
-    return {'identifier': 'fuel_gauge',
-            'fuel_gauge_energy_consumption_mwh': fuel_gauge_delta * voltage}
+    power_results = {'identifier': 'fuel_gauge'}
+    power_results['fuel_gauge_energy_consumption_mwh'] = (
+        fuel_gauge_delta * voltage)
+    return power_results