[polymer] Merge of master into polymer10-migration

tracing/tracing/value/ui/related_event_set_span_test.html

Index: tracing/tracing/value/ui/related_event_set_span_test.html
diff --git a/tracing/tracing/value/ui/related_event_set_span_test.html b/tracing/tracing/value/ui/related_event_set_span_test.html
index 97adc4d708c07db0fe7bb758799d70976b76ba7a..bc33772f8c7df7721b201be78d47b48595dee28a 100644
--- a/tracing/tracing/value/ui/related_event_set_span_test.html
+++ b/tracing/tracing/value/ui/related_event_set_span_test.html
@@ -26,14 +26,15 @@ tr.b.unittest.testSuite(function() {
     tr.c.TestUtils.newModel(function(model) {
       var proc = model.getOrCreateProcess(1);
       var thread = proc.getOrCreateThread(2);
-      var event = tr.c.TestUtils.newSliceEx({start: 0, duration: 1});
+      var event = tr.c.TestUtils.newSliceEx(
+          {title: 'a', start: 0, duration: 1});
       thread.sliceGroup.pushSlice(event);
       diagnostic.push(event);
     });
     var span = tr.v.ui.createDiagnosticSpan(diagnostic);
     assert.strictEqual('TR-V-UI-RELATED-EVENT-SET-SPAN', span.tagName);
     this.addHTMLOutput(span);
-    assert.strictEqual('1 event', span.textContent);
+    assert.strictEqual('a 1.000 ms', span.textContent);
   });
 
   test('instantiate_RelatedEventSet2', function() {