Revert of Fix power measurement with dumpsys when the format is unrecognized.

Revert of Fix power measurement with dumpsys when the format is unrecognized. (https://codereview.chromium.org/225493003/)

Reason for revert:
Breaks buildbots (and trybots)
http://goo.gl/a2DGKW
http://goo.gl/FX2KBP
http://goo.gl/6vvIHR

Original issue's description:
> Fix power measurement with dumpsys when the format is unrecognized.
> 
> dumpsys information for older release of android doesn't contain the
> needed information. This CL prevent the application to crash in that
> case.
> 
> BUG=359883
> TBR=tonyg@chromium.org
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=261708

TBR=tonyg@chromium.org,qsr@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=359883

[Nikita (slow), 2014-04-04 10:23:24]

Created Revert of Fix power measurement with dumpsys when the format is
unrecognized.

[commit-bot: I haz the power, 2014-04-04 10:23:57]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/nkostylev@chromium.org/225693002/1

[commit-bot: I haz the power, 2014-04-04 10:24:20]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-04 10:24:20]

Failed to apply patch for
tools/telemetry/telemetry/core/platform/power_monitor/android_dumpsys_power_monitor.py:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file
tools/telemetry/telemetry/core/platform/power_monitor/android_dumpsys_power_monitor.py
  Hunk #1 FAILED at 4.
  Hunk #2 FAILED at 59.
  Hunk #3 FAILED at 79.
  Hunk #4 FAILED at 94.
  4 out of 4 hunks FAILED -- saving rejects to file
tools/telemetry/telemetry/core/platform/power_monitor/android_dumpsys_power_monitor.py.rej

Patch:      
tools/telemetry/telemetry/core/platform/power_monitor/android_dumpsys_power_monitor.py
Index:
tools/telemetry/telemetry/core/platform/power_monitor/android_dumpsys_power_monitor.py
diff --git
a/tools/telemetry/telemetry/core/platform/power_monitor/android_dumpsys_power_monitor.py
b/tools/telemetry/telemetry/core/platform/power_monitor/android_dumpsys_power_monitor.py
index
0e7cef57b2b51a6669c84ce983a011fb6f60b80c..fae8a47ff1605ba584fcc2252d63cd23dcbbd4be
100644
---
a/tools/telemetry/telemetry/core/platform/power_monitor/android_dumpsys_power_monitor.py
+++
b/tools/telemetry/telemetry/core/platform/power_monitor/android_dumpsys_power_monitor.py
@@ -4,7 +4,6 @@
 
 import telemetry.core.platform.power_monitor as power_monitor
 
-import logging
 import csv
 
 from collections import defaultdict
@@ -59,11 +58,6 @@
     Returns:
         Dictionary in the format returned by StopMonitoringPower().
     """
-    # Raw power usage samples.
-    out_dict = {}
-    out_dict['identifier'] = 'dumpsys'
-    out_dict['power_samples_mw'] = []
-
     # csv columns
     DUMP_VERSION_INDEX = 0
     COLUMN_TYPE_INDEX = 3
@@ -79,10 +73,7 @@
         continue
       entries_by_type[entry[COLUMN_TYPE_INDEX]].append(entry)
     # Find the uid of for the given package.
-    if not package in entries_by_type:
-      logging.warning('Unable to parse dumpsys output. Please upgrade the OS.')
-      out_dict['energy_consumption_mwh'] = 0
-      return out_dict
+    assert package in entries_by_type, 'Expected package not found'
     assert len(entries_by_type[package]) == 1, 'Multiple entries for package.'
     uid = entries_by_type[package][0][PACKAGE_UID_INDEX]
     consumptions_mah = [float(entry[PWI_POWER_COMSUMPTION_INDEX])
@@ -94,5 +85,9 @@
     # 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.
     consumption_mwh = consumption_mah * 4.0
+    # Raw power usage samples.
+    out_dict = {}
+    out_dict['identifier'] = 'dumpsys'
+    out_dict['power_samples_mw'] = []
     out_dict['energy_consumption_mwh'] = consumption_mwh
     return out_dict

[Nikita (slow), 2014-04-04 10:25:37]

Ok, already reverted in https://codereview.chromium.org/225683002