[polymer] Merge of master into polymer10-migration

tracing/tracing/model/power_series_test.html

Index: tracing/tracing/model/power_series_test.html
diff --git a/tracing/tracing/model/power_series_test.html b/tracing/tracing/model/power_series_test.html
index 331307d7e26d277678c5d88ca2940ef173762538..034cae8b786f14df9f231b67d1bb13210565daf0 100644
--- a/tracing/tracing/model/power_series_test.html
+++ b/tracing/tracing/model/power_series_test.html
@@ -129,28 +129,21 @@ tr.b.unittest.testSuite(function() {
     assert.equal(series.bounds.max, 4);
   });
 
-  test('iterateAllEventsInThisContainer', function() {
+  test('childEvents_empty', function() {
     var series = new PowerSeries(new Model().device);
-
     var eventsInSeries = [];
-    series.iterateAllEventsInThisContainer(
-        function() { return true; },
-        function(event) {
-          eventsInSeries.push(event);
-        });
-
+    for (var event of series.childEvents())
+      eventsInSeries.push(event);
     assert.deepEqual(eventsInSeries, []);
+  });
 
+  test('childEvents_nonempty', function() {
+    var series = new PowerSeries(new Model().device);
     var sample1 = series.addPowerSample(0, 1);
     var sample2 = series.addPowerSample(1, 2);
-
-    eventsInSeries = [];
-    series.iterateAllEventsInThisContainer(
-        function() { return true; },
-        function(event) {
-          eventsInSeries.push(event);
-        });
-
+    var eventsInSeries = [];
+    for (var event of series.childEvents())
+      eventsInSeries.push(event);
     assert.deepEqual(eventsInSeries, [sample1, sample2]);
   });
 });