[polymer] Merge of master into polymer10-migration

tracing/tracing/model/slice_test.html

Index: tracing/tracing/model/slice_test.html
diff --git a/tracing/tracing/model/slice_test.html b/tracing/tracing/model/slice_test.html
index 4a71e1364385cf799189825f6204af4b5128a9fd..42352b9396a2ff1bac19ae2ceec6914731daef65 100644
--- a/tracing/tracing/model/slice_test.html
+++ b/tracing/tracing/model/slice_test.html
@@ -47,9 +47,8 @@ tr.b.unittest.testSuite(function() {
     group.createSubSlices();
 
     var foundSlices = [];
-    sC1.findTopmostSlicesRelativeToThisSlice(PREDICATE, slice => (
-        foundSlices.push(slice))
-    );
+    for (var slice of sC1.findTopmostSlicesRelativeToThisSlice(PREDICATE))
+      foundSlices.push(slice);
 
     assert.deepEqual([sC1], foundSlices);
   });
@@ -69,13 +68,12 @@ tr.b.unittest.testSuite(function() {
     group.createSubSlices();
 
     var foundSlices = [];
-    sD.findTopmostSlicesRelativeToThisSlice(PREDICATE, slice => (
-        foundSlices.push(slice)));
-
+    for (var slice of sD.findTopmostSlicesRelativeToThisSlice(PREDICATE))
+      foundSlices.push(slice);
     assert.deepEqual([sC1, sC2], foundSlices);
   });
 
-  test('iterateAllDescendents', function() {
+  test('enumerateAllDescendents', function() {
     var group = new SliceGroup(newFakeThread());
 
     var sA = group.pushSlice(newSliceEx(
@@ -108,7 +106,7 @@ tr.b.unittest.testSuite(function() {
     assert.equal(sC.mostTopLevelSlice, sA);
   });
 
-  test('iterateAllAncestors', function() {
+  test('enumerateAllAncestors', function() {
     var group = new SliceGroup(newFakeThread());
 
     var sA = group.pushSlice(newSliceEx(