[polymer] Merge of master into polymer10-migration

tracing/tracing/model/power_series.html

Index: tracing/tracing/model/power_series.html
diff --git a/tracing/tracing/model/power_series.html b/tracing/tracing/model/power_series.html
index 24876b3e339ac6b9febbe1cfb0592b27c3a237da..f3a873bab50c3edb519f3ebf8a5cc35f038c0519 100644
--- a/tracing/tracing/model/power_series.html
+++ b/tracing/tracing/model/power_series.html
@@ -114,17 +114,9 @@ tr.exportTo('tr.model', function() {
       this.bounds.addValue(this.samples_[this.samples_.length - 1].start);
     },
 
-    findTopmostSlicesInThisContainer: function(eventPredicate, callback,
-                                               opt_this) {
+    childEvents: function*() {
+      yield * this.samples_;
     },
-
-    childEvents: function*(eventTypePredicate, opt_this) {
-      if (eventTypePredicate.call(opt_this, PowerSample))
-        yield * this.samples_;
-    },
-
-    childEventContainers: function*(callback, opt_this) {
-    }
   };
 
   return {