[polymer] Merge of master into polymer10-migration

tracing/tracing/model/thread.html

Index: tracing/tracing/model/thread.html
diff --git a/tracing/tracing/model/thread.html b/tracing/tracing/model/thread.html
index 16d8ea63a4131ce2247448b70d0eaa22b288bbd8..c11aeb13d1d9e8fe87d90acd6f121a8b705db66f 100644
--- a/tracing/tracing/model/thread.html
+++ b/tracing/tracing/model/thread.html
@@ -73,10 +73,6 @@ tr.exportTo('tr.model', function() {
       return Thread.compare(this, that);
     },
 
-    findTopmostSlicesInThisContainer: function(eventPredicate, callback,
-                                               opt_this) {
-    },
-
     childEventContainers: function*() {
       if (this.sliceGroup.length)
         yield this.sliceGroup;
@@ -86,11 +82,9 @@ tr.exportTo('tr.model', function() {
         yield this.asyncSliceGroup;
     },
 
-    childEvents: function*(eventTypePredicate, opt_this) {
-      if (this.timeSlices && this.timeSlices.length) {
-        if (eventTypePredicate.call(opt_this, ThreadTimeSlice))
-          yield * this.timeSlices;
-      }
+    childEvents: function*() {
+      if (this.timeSlices)
+        yield * this.timeSlices;
     },
 
     iterateAllPersistableObjects: function(cb) {