[polymer] Merge of master into polymer10-migration

tracing/tracing/extras/chrome/cc/input_latency_async_slice.html

Index: tracing/tracing/extras/chrome/cc/input_latency_async_slice.html
diff --git a/tracing/tracing/extras/chrome/cc/input_latency_async_slice.html b/tracing/tracing/extras/chrome/cc/input_latency_async_slice.html
index 44871935d2adcaac82c2af1e1a9b97485f520ec4..30d0e620b535fdeff684029dbd75e4d70d537bee 100644
--- a/tracing/tracing/extras/chrome/cc/input_latency_async_slice.html
+++ b/tracing/tracing/extras/chrome/cc/input_latency_async_slice.html
@@ -4,9 +4,10 @@ Copyright (c) 2013 The Chromium Authors. All rights reserved.
 Use of this source code is governed by a BSD-style license that can be
 found in the LICENSE file.
 -->
-<link rel="import" href="/tracing/model/helpers/chrome_model_helper.html">
+
 <link rel="import" href="/tracing/model/async_slice.html">
 <link rel="import" href="/tracing/model/event_set.html">
+<link rel="import" href="/tracing/model/helpers/chrome_model_helper.html">
 
 <script>
 'use strict';
@@ -122,17 +123,17 @@ tr.exportTo('tr.e.cc', function() {
 
     determineLegacyTypeName_: function() {
       // Iterate over all descendent subSlices.
-      this.iterateAllDescendents(function(subSlice) {
+      for (var subSlice of this.enumerateAllDescendents()) {
 
         // If |subSlice| is not an InputLatencyAsyncSlice, then ignore it.
         var subSliceIsAInputLatencyAsyncSlice = (
             subSlice instanceof InputLatencyAsyncSlice);
         if (!subSliceIsAInputLatencyAsyncSlice)
-          return;
+          continue;
 
         // If |subSlice| does not have a typeName, then ignore it.
         if (!subSlice.typeName)
-          return;
+          continue;
 
         // If |this| already has a typeName and |subSlice| has a different
         // typeName, then explode!
@@ -148,7 +149,7 @@ tr.exportTo('tr.e.cc', function() {
         // The typeName of |this| top-level event is whatever the typeName of
         // |subSlice| is. Set |this.typeName_| to the subSlice's typeName.
         this.typeName_ = subSlice.typeName_;
-      }, this);
+      }
 
       // If typeName could not be determined, then explode!
       if (!this.typeName_)