Index: tracing/tracing/extras/android/android_auditor.html |
diff --git a/tracing/tracing/extras/android/android_auditor.html b/tracing/tracing/extras/android/android_auditor.html |
index 8cbe1fb995985ac4f9b70752d708c2fd795a556d..fceaf546d8a3c49a70df49173a16b4f4da024068 100644 |
--- a/tracing/tracing/extras/android/android_auditor.html |
+++ b/tracing/tracing/extras/android/android_auditor.html |
@@ -6,9 +6,9 @@ found in the LICENSE file. |
--> |
<link rel="import" href="/tracing/base/iteration_helpers.html"> |
-<link rel="import" href="/tracing/base/range_utils.html"> |
+<link rel="import" href="/tracing/base/math/range_utils.html"> |
+<link rel="import" href="/tracing/base/math/statistics.html"> |
<link rel="import" href="/tracing/base/scalar.html"> |
-<link rel="import" href="/tracing/base/statistics.html"> |
<link rel="import" href="/tracing/base/unit.html"> |
<link rel="import" href="/tracing/core/auditor.html"> |
<link rel="import" href="/tracing/model/alert.html"> |
@@ -28,7 +28,7 @@ tr.exportTo('tr.e.audits', function() { |
var Auditor = tr.c.Auditor; |
var AndroidModelHelper = tr.model.helpers.AndroidModelHelper; |
var ColorScheme = tr.b.ColorScheme; |
- var Statistics = tr.b.Statistics; |
+ var Statistics = tr.b.math.Statistics; |
var FRAME_PERF_CLASS = tr.model.FRAME_PERF_CLASS; |
var Alert = tr.model.Alert; |
var EventInfo = tr.model.EventInfo; |
@@ -533,7 +533,8 @@ tr.exportTo('tr.e.audits', function() { |
events[events.length - 1].max - events[0].min); |
this.model.userModel.expectations.push(ir); |
}.bind(this); |
- tr.b.mergeRanges(tr.b.convertEventsToRanges(events), 30, mergerFunction); |
+ tr.b.math.mergeRanges( |
+ tr.b.math.convertEventsToRanges(events), 30, mergerFunction); |
}, |
addInputInteractionRecords: function() { |
@@ -550,9 +551,10 @@ tr.exportTo('tr.e.audits', function() { |
this.model.userModel.expectations.push(ir); |
}.bind(this); |
var inputRanges = inputSamples.map(function(sample) { |
- return tr.b.Range.fromExplicitRange(sample.timestamp, sample.timestamp); |
+ return tr.b.math.Range.fromExplicitRange( |
+ sample.timestamp, sample.timestamp); |
}); |
- tr.b.mergeRanges(inputRanges, 30, mergerFunction); |
+ tr.b.math.mergeRanges(inputRanges, 30, mergerFunction); |
} |
}; |