[Android][Telemetry] Seperate fuel gauge from AndroidDumpsysPowerMonitor

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

Index: tools/telemetry/telemetry/internal/platform/power_monitor/android_dumpsys_power_monitor_unittest.py
diff --git a/tools/telemetry/telemetry/internal/platform/power_monitor/android_dumpsys_power_monitor_unittest.py b/tools/telemetry/telemetry/internal/platform/power_monitor/android_dumpsys_power_monitor_unittest.py
index 4021dbbf3e871cccedb1d6f170f92d38cced0725..1cfac3da8f27050d83db5d1d73c0cd88626eb4a5 100644
--- a/tools/telemetry/telemetry/internal/platform/power_monitor/android_dumpsys_power_monitor_unittest.py
+++ b/tools/telemetry/telemetry/internal/platform/power_monitor/android_dumpsys_power_monitor_unittest.py
@@ -12,36 +12,21 @@ class DumpsysPowerMonitorMonitorTest(unittest.TestCase):
   def testEnergyComsumption(self):
     package = 'com.google.android.apps.chrome'
     power_data = {'data': [23.9], 'uid': '12345'}
-    fuel_gauge_delta = None
     results = (
         android_dumpsys_power_monitor.DumpsysPowerMonitor.ProcessPowerData(
-            power_data, 4.0, package, fuel_gauge_delta))
+            power_data, 4.0, package))
     self.assertEqual(results['identifier'], 'dumpsys')
     self.assertAlmostEqual(results['energy_consumption_mwh'], 95.6)
-    self.assertEqual(results.get('fuel_gauge_energy_consumption_mwh'), None)
 
   # Older version of the OS do not have the data.
   def testNoData(self):
     package = 'com.android.chrome'
     power_data = None
-    fuel_gauge_delta = None
     results = (
         android_dumpsys_power_monitor.DumpsysPowerMonitor.ProcessPowerData(
-            power_data, 4.0, package, fuel_gauge_delta))
+            power_data, 4.0, package))
     self.assertEqual(results['identifier'], 'dumpsys')
     self.assertEqual(results['energy_consumption_mwh'], 0)
-    self.assertEqual(results.get('fuel_gauge_energy_consumption_mwh'), None)
-
-  def testFuelGauge(self):
-    package = 'com.google.android.apps.chrome'
-    power_data = {'data': [23.9], 'uid': '12345'}
-    fuel_gauge_delta = 10
-    results = (
-        android_dumpsys_power_monitor.DumpsysPowerMonitor.ProcessPowerData(
-            power_data, 4.0, package, fuel_gauge_delta))
-    self.assertEqual(results['identifier'], 'dumpsys')
-    self.assertAlmostEqual(results['energy_consumption_mwh'], 95.6)
-    self.assertEqual(results['fuel_gauge_energy_consumption_mwh'], 40)
 
 
 if __name__ == '__main__':