Revert of [Android][Telemetry] Add support for multiple power monitors

tools/perf/metrics/power.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 time
 
 from telemetry.util import process_statistic_timeline_data
 from telemetry.value import scalar
 
 from metrics import Metric
 
 
-MONSOON_POWER_LABEL = 'monsoon_energy_consumption_mwh'
-FUELGAUGE_POWER_LABEL = 'fuel_gauge_energy_consumption_mwh'
-APP_POWER_LABEL = 'application_energy_consumption_mwh'
-TOTAL_POWER_LABEL = 'energy_consumption_mwh'
-
 class PowerMetric(Metric):
   """A metric for measuring power usage."""
 
   # System power draw while idle.
   _quiescent_power_draw_mwh = 0
 
   def __init__(self, platform, quiescent_measurement_time_s=0):
     """PowerMetric Constructor.
 
     Args:
@@ skipping 35 matching lines @@
       return
 
     # Only perform quiescent measurement once per run.
     if PowerMetric._quiescent_power_draw_mwh:
       return
 
     self._platform.StartMonitoringPower(self._browser)
     time.sleep(measurement_time_s)
     power_results = self._platform.StopMonitoringPower()
     PowerMetric._quiescent_power_draw_mwh = (
-        power_results.get(TOTAL_POWER_LABEL, 0))
+        power_results.get('energy_consumption_mwh', 0))
 
   def Start(self, _, tab):
     self._browser = tab.browser
 
     if not self._platform.CanMonitorPower():
       return
 
     self._results = None
     self._StopInternal()
 
@@ skipping 13 matching lines @@
 
     This function needs to be robust in the face of differing power data on
     various platforms. Therefore data existence needs to be checked when
     building up the results. Additionally 0 is a valid value for many of the
     metrics here which is why there are plenty of checks for 'is not None'
     below.
     """
     if not self._results:
       return
 
-    application_energy_consumption_mwh = self._results.get(APP_POWER_LABEL)
-    total_energy_consumption_mwh = self._results.get(TOTAL_POWER_LABEL)
-    fuel_gauge_energy_consumption_mwh = self._results.get(FUELGAUGE_POWER_LABEL)
-    monsoon_energy_consumption_mwh = self._results.get(MONSOON_POWER_LABEL)
+    application_energy_consumption_mwh = (
+        self._results.get('application_energy_consumption_mwh'))
+    total_energy_consumption_mwh = self._results.get('energy_consumption_mwh')
+    fuel_gauge_energy_consumption_mwh = (
+        self._results.get('fuel_gauge_energy_consumption_mwh'))
 
     if (PowerMetric._quiescent_power_draw_mwh and
         application_energy_consumption_mwh is None and
         total_energy_consumption_mwh is not None):
       application_energy_consumption_mwh = max(
           total_energy_consumption_mwh - PowerMetric._quiescent_power_draw_mwh,
           0)
 
     if fuel_gauge_energy_consumption_mwh is not None:
       results.AddValue(scalar.ScalarValue(
-          results.current_page, FUELGAUGE_POWER_LABEL, 'mWh',
+          results.current_page, 'fuel_gauge_energy_consumption_mwh', 'mWh',
           fuel_gauge_energy_consumption_mwh))
 
-    if monsoon_energy_consumption_mwh is not None:
-      results.AddValue(scalar.ScalarValue(
-          results.current_page, MONSOON_POWER_LABEL, 'mWh',
-          monsoon_energy_consumption_mwh))
-
     if total_energy_consumption_mwh is not None:
       results.AddValue(scalar.ScalarValue(
-          results.current_page, TOTAL_POWER_LABEL, 'mWh',
+          results.current_page, 'energy_consumption_mwh', 'mWh',
           total_energy_consumption_mwh))
 
     if application_energy_consumption_mwh is not None:
       results.AddValue(scalar.ScalarValue(
-          results.current_page, APP_POWER_LABEL, 'mWh',
+          results.current_page, 'application_energy_consumption_mwh', 'mWh',
           application_energy_consumption_mwh))
 
     component_utilization = self._results.get('component_utilization', {})
     # GPU Frequency.
     gpu_power = component_utilization.get('gpu', {})
     gpu_freq_hz = gpu_power.get('average_frequency_hz')
     if gpu_freq_hz is not None:
       results.AddValue(scalar.ScalarValue(
           results.current_page, 'gpu_average_frequency_hz', 'hz', gpu_freq_hz,
           important=False))
@@ skipping 56 matching lines @@
       continue
 
     assert isinstance(cpu_stats[process_type]['IdleWakeupCount'],
         process_statistic_timeline_data.IdleWakeupTimelineData)
     idle_wakeup_delta = (cpu_stats[process_type]['IdleWakeupCount'] -
                         start_cpu_stats[process_type]['IdleWakeupCount'])
     cpu_delta[process_type] = idle_wakeup_delta.total_sum()
     total = total + cpu_delta[process_type]
   cpu_delta['Total'] = total
   return cpu_delta