[polymer] Merge of master into polymer10-migration

tracing/tracing/metrics/sample_metric.html

Index: tracing/tracing/metrics/sample_metric.html
diff --git a/tracing/tracing/metrics/sample_metric.html b/tracing/tracing/metrics/sample_metric.html
index 43ae5dae567dc833ef58bede398ba61fd27f942d..b031e7b2571e94019787ee68098dc3fe6f89a94f 100644
--- a/tracing/tracing/metrics/sample_metric.html
+++ b/tracing/tracing/metrics/sample_metric.html
@@ -29,10 +29,22 @@ tr.exportTo('tr.metrics', function() {
     values.addValue(new tr.v.NumericValue('baz', n3));
   }
 
+  function sampleMetric2(values, model) {
+    var n1 = new tr.v.ScalarNumeric(sizeInBytes_smallerIsBetter, 1);
+    var n2 = new tr.v.ScalarNumeric(sizeInBytes_smallerIsBetter, 2);
+    var n3 = SIZE_NUMERIC_BUILDER.build();
+    n3.add(1);
+    values.addValue(new tr.v.NumericValue('one', n1));
+    values.addValue(new tr.v.NumericValue('two', n2));
+    values.addValue(new tr.v.NumericValue('three', n3));
+  }
+
   tr.metrics.MetricRegistry.register(sampleMetric);
+  tr.metrics.MetricRegistry.register(sampleMetric2);
 
   return {
-    sampleMetric: sampleMetric
+    sampleMetric: sampleMetric,
+    sampleMetric2: sampleMetric2
   };
 });
 </script>