Revert of Fail gracefully if no Chrome trace or insufficient power samples.

tracing/tracing/metrics/system_health/power_metric.html

Index: tracing/tracing/metrics/system_health/power_metric.html
diff --git a/tracing/tracing/metrics/system_health/power_metric.html b/tracing/tracing/metrics/system_health/power_metric.html
index ddb28ae1c35be09c478e042f4aa06c0df550fb3e..5af75235d42f2527e49dd3d125b23d17978ff657 100644
--- a/tracing/tracing/metrics/system_health/power_metric.html
+++ b/tracing/tracing/metrics/system_health/power_metric.html
@@ -5,7 +5,6 @@
 found in the LICENSE file.
 -->
 
-<link rel="import" href="/tracing/base/range.html">
 <link rel="import" href="/tracing/base/statistics.html">
 <link rel="import" href="/tracing/metrics/metric_registry.html">
 <link rel="import" href="/tracing/metrics/system_health/loading_metric.html">
@@ -134,9 +133,12 @@
    * @param {tr.v.Histogram} powerHist - Histogram to store power data.
    */
   function storePowerData_(data, timeHist, energyHist, powerHist) {
-    if (timeHist !== undefined) timeHist.addSample(data.duration);
-    if (energyHist !== undefined) energyHist.addSample(data.energy);
-    if (powerHist !== undefined) powerHist.addSample(data.power);
+    if (timeHist !== undefined)
+      timeHist.addSample(data.duration);
+    if (energyHist !== undefined)
+      energyHist.addSample(data.energy);
+    if (powerHist !== undefined)
+      powerHist.addSample(data.power);
   }
 
   function createHistograms_(model, values) {
@@ -209,11 +211,9 @@
    * purposes. This function only keeps track of metrics that are based
    * on the start and end time of the RAIL stages.
    */
-  function processInteractionRecord_(exp, model, hists, chromeBounds) {
+  function processInteractionRecord_(exp, model, hists) {
     var currTitle = exp.title.toLowerCase().replace(' ', '_');
-    var interval = tr.b.Range.fromExplicitRange(exp.start, exp.end)
-        .findIntersection(chromeBounds);
-    var data = getPowerData_(model, interval.min, interval.max);
+    var data = getPowerData_(model, exp.start, exp.end);
 
     // Add the samples for the "generic" RAIL stage metrics.
     storePowerData_(data, hists.railStageToTimeHist.get(currTitle),
@@ -227,9 +227,8 @@
     }
 
     // If this is a video stage, add the sample for the video metrics.
-    if (exp.title.indexOf("Video") !== -1) {
+    if (exp.title.indexOf("Video") !== -1)
       storePowerData_(data, undefined, undefined, hists.videoPowerHist)
-    }
   }
 
   /**
@@ -237,11 +236,10 @@
    * in |hists|. Note that this is not in processInteractionRecord_ because
    * the loading metric intervals don't correspond exactly to the RAIL stages.
    */
-  function computeLoadingMetric_(model, hists, chromeBounds) {
-    var ttiIntervals = getNavigationTTIIntervals_(model);
+  function computeLoadingMetric_(model, hists) {
+    var intervals = getNavigationTTIIntervals_(model);
     var lastLoadTime = undefined;
-    for (var ttiInterval of ttiIntervals) {
-      var interval = ttiInterval.findIntersection(chromeBounds);
+    for (var interval of intervals) {
       var loadData = getPowerData_(model, interval.min, interval.max);
       storePowerData_(loadData, hists.loadTimeHist, hists.loadEnergyHist,
           undefined);
@@ -249,7 +247,7 @@
           Math.max(lastLoadTime, interval.max));
     }
     if (lastLoadTime !== undefined) {
-      var afterLoadData = getPowerData_(model, lastLoadTime, chromeBounds.max);
+      var afterLoadData = getPowerData_(model, lastLoadTime, model.bounds.max);
       storePowerData_(afterLoadData, hists.afterLoadTimeHist,
           undefined, hists.afterLoadPowerHist);
     }
@@ -258,72 +256,29 @@
   /**
    * Compute the per-frame power metrics and put the results in |hists|.
    */
-  function computeFrameBasedPowerMetric_(model, hists, chromeBounds) {
+  function computeFrameBasedPowerMetric_(model, hists) {
     model.device.powerSeries.updateBounds();
-    var currentTime = chromeBounds.min;
-    while (currentTime < chromeBounds.max) {
+    var currentTime = model.device.powerSeries.bounds.min;
+    while (currentTime < model.device.powerSeries.bounds.max) {
       var frameData = getPowerData_(model, currentTime, currentTime + FRAME_MS);
       hists.frameEnergyHist.addSample(frameData.energy);
       currentTime += FRAME_MS;
     }
   }
 
-  function getChromeBounds(model) {
-    var chromeBounds = new tr.b.Range();
-    var chromeHelper = model.getOrCreateHelper(
-        tr.model.helpers.ChromeModelHelper);
-    for (var pid in chromeHelper.browserHelpers) {
-      chromeBounds.addRange(chromeHelper.browserHelpers[pid].mainThread.bounds);
-    }
-    for (var pid in chromeHelper.rendererHelpers) {
-      chromeBounds.addRange(
-          chromeHelper.rendererHelpers[pid].mainThread.bounds);
-    }
-    return chromeBounds;
-  }
 
   function powerMetric(values, model) {
-    // Fail gracefully if there's no Chrome trace available.
-    var chromeHelper = model.getOrCreateHelper(
-        tr.model.helpers.ChromeModelHelper);
-    if (chromeHelper === undefined) {
-      console.error('Power metric error: no Chrome trace.');
+    if (!model.device.powerSeries)
       return;
-    }
-
-    // Fail gracefully if there's no power series available.
-    if (!model.device.powerSeries) {
-      console.error('Power metric error: no power series available.');
-      return;
-    }
-
-    // Fail gracefully if the power series doesn't cover the entire trace.
-    // (add 1 ms grace period at each end)
-    var chromeBounds = getChromeBounds(model);
-    if (chromeBounds.min == undefined || chromeBounds.max == undefined) {
-      console.error('Power metric error: unable to determine bounds of ' +
-          'Chrome trace (possibly no events in Chrome trace).');
-      return;
-    }
-    if (model.device.powerSeries.bounds.min >= chromeBounds.min + 1.0) {
-      console.error('Power metric error: power series starts after beginning ' +
-          'of Chrome trace.');
-      return;
-    }
-    if (model.device.powerSeries.bounds.max <= chromeBounds.max - 1.0) {
-      console.error('Power metric error: power series ends before end of ' +
-          'Chrome trace.');
-      return;
-    }
+
     var hists = createHistograms_(model, values);
-    for(var exp of model.userModel.expectations) {
-      processInteractionRecord_(exp, model, hists, chromeBounds);
-    }
+    for(var exp of model.userModel.expectations)
+      processInteractionRecord_(exp, model, hists);
 
     // The following two metrics aren't based directly on the IR intervals,
     // and so need to be computed outside the processInteractionRecord_ loop.
-    computeLoadingMetric_(model, hists, chromeBounds);
-    computeFrameBasedPowerMetric_(model, hists, chromeBounds);
+    computeLoadingMetric_(model, hists);
+    computeFrameBasedPowerMetric_(model, hists);
   }
 
   tr.metrics.MetricRegistry.register(powerMetric);