[polymer] Merge of master into polymer10-migration

tracing/tracing/model/object_collection.html

Index: tracing/tracing/model/object_collection.html
diff --git a/tracing/tracing/model/object_collection.html b/tracing/tracing/model/object_collection.html
index 1410b27c3e916b28cf828357daa14e77268fab0c..93122c8d4f5d78fed01afb6b9bed2c8b14c2e1f0 100644
--- a/tracing/tracing/model/object_collection.html
+++ b/tracing/tracing/model/object_collection.html
@@ -40,21 +40,10 @@ tr.exportTo('tr.model', function() {
   ObjectCollection.prototype = {
     __proto__: tr.model.EventContainer.prototype,
 
-    findTopmostSlicesInThisContainer: function(eventPredicate, callback,
-                                               opt_this) {
-    },
-
-    childEventContainers: function*() {
-    },
-
-    childEvents: function*(eventTypePredicate, opt_this) {
-      var bI = !!eventTypePredicate.call(opt_this, ObjectInstance);
-      var bS = !!eventTypePredicate.call(opt_this, ObjectSnapshot);
+    childEvents: function*() {
       for (var instance of this.getAllObjectInstances()) {
-        if (bI)
-          yield instance;
-        if (bS)
-          yield * instance.snapshots;
+        yield instance;
+        yield * instance.snapshots;
       }
     },