[polymer] Merge of master into polymer10-migration

tracing/tracing/metrics/metric_map_function_test.html

Index: tracing/tracing/metrics/metric_map_function_test.html
diff --git a/tracing/tracing/metrics/metric_map_function_test.html b/tracing/tracing/metrics/metric_map_function_test.html
index f66ed23949cfc95302d89b4c0a586a971545b4b1..febd702fdceb657ab71011268eb5d0501399b838 100644
--- a/tracing/tracing/metrics/metric_map_function_test.html
+++ b/tracing/tracing/metrics/metric_map_function_test.html
@@ -46,16 +46,22 @@ tr.b.unittest.testSuite(function() {
     assert.throw(function() {
       var result = new pi.mre.MreResult();
       tr.metrics.metricMapFunction(result, m, {});
-    }, Error, 'A metric name should be specified.');
+    }, Error, 'Metric names should be specified.');
 
     assert.throw(function() {
       var result = new pi.mre.MreResult();
-      tr.metrics.metricMapFunction(result, m, {'metric': 'wrongMetric'});
+      tr.metrics.metricMapFunction(result, m, {'metrics': ['wrongMetric']});
     }, Error, '"wrongMetric" is not a registered metric.');
 
     var result = new pi.mre.MreResult();
-    tr.metrics.metricMapFunction(result, m, {'metric': 'sampleMetric'});
+    tr.metrics.metricMapFunction(result, m, {'metrics': ['sampleMetric']});
     assert.property(result.pairs, 'values');
+    assert.equal(result.pairs.values.length, 9);
+
+    var result2 = new pi.mre.MreResult();
+    tr.metrics.metricMapFunction(
+        result2, m, {'metrics': ['sampleMetric', 'sampleMetric2']});
+    assert.property(result2.pairs, 'values');
   });
 });
 </script>