[polymer] Merge of master into polymer10-migration

tracing/tracing/ui/tracks/cpu_usage_track_test.html

Index: tracing/tracing/ui/tracks/cpu_usage_track_test.html
diff --git a/tracing/tracing/ui/tracks/cpu_usage_track_test.html b/tracing/tracing/ui/tracks/cpu_usage_track_test.html
index 519d37b9ca167526638aacc5d8a4a622f49b76f3..0ef7005dcaeac637074465599f73db4c79681ff9 100644
--- a/tracing/tracing/ui/tracks/cpu_usage_track_test.html
+++ b/tracing/tracing/ui/tracks/cpu_usage_track_test.html
@@ -120,6 +120,18 @@ tr.b.unittest.testSuite(function() {
     assertArrayValuesCloseTo(actualValue, expectedValue);
   });
 
+  test('computeCpuUsage_tooManyIntervals', function() {
+    var sliceA = new tr.model.ThreadSlice('', title, 0, 5, {}, 50);
+    sliceA.cpuDuration = 25;
+    var sliceB = new tr.model.ThreadSlice(
+        '', title, 0, 50000010, {}, 50000030);
+    sliceB.cpuDuration = 15;
+
+    var model = buildModel([[sliceA, sliceB]]);
+
+    assert.throws(() => createCpuUsageTrack.call(this, model, 5));
+  });
+
   test('computeCpuUsage_floatAndComplexIntervals', function() {
     // First thread.
     // 0    5    10   15   20   25   30   35   40   45   50   55