[polymer] Merge of master into polymer10-migration

tracing/trace_viewer.gypi

 # Copyright (c) 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'tracing_css_files': [
       'tracing/ui/base/line_chart.css',
       'tracing/ui/base/list_view.css',
       'tracing/ui/base/pie_chart.css',
@@ skipping 147 matching lines @@
       'tracing/importer/empty_importer.html',
       'tracing/importer/find_input_expectations.html',
       'tracing/importer/find_load_expectations.html',
       'tracing/importer/find_startup_expectations.html',
       'tracing/importer/import.html',
       'tracing/importer/importer.html',
       'tracing/importer/proto_expectation.html',
       'tracing/importer/simple_line_reader.html',
       'tracing/importer/user_model_builder.html',
       'tracing/metrics/all_metrics.html',
+      'tracing/metrics/blink/gc_metric.html',
       'tracing/metrics/metric_registry.html',
       'tracing/metrics/sample_metric.html',
       'tracing/metrics/system_health/clock_sync_latency_metric.html',
       'tracing/metrics/system_health/efficiency_metric.html',
       'tracing/metrics/system_health/first_paint_metric.html',
       'tracing/metrics/system_health/hazard_metric.html',
       'tracing/metrics/system_health/long_tasks_metric.html',
       'tracing/metrics/system_health/memory_metric.html',
       'tracing/metrics/system_health/power_metric.html',
       'tracing/metrics/system_health/responsiveness_metric.html',
@@ skipping 285 matching lines @@
       'tracing/value/diagnostics/diagnostic.html',
       'tracing/value/diagnostics/diagnostic_map.html',
       'tracing/value/diagnostics/generic.html',
       'tracing/value/diagnostics/iteration_info.html',
       'tracing/value/diagnostics/related_event_set.html',
       'tracing/value/diagnostics/related_value_map.html',
       'tracing/value/diagnostics/related_value_set.html',
       'tracing/value/generic_table.html',
       'tracing/value/numeric.html',
       'tracing/value/time_display_mode.html',
+      'tracing/value/ui/all_value_set_views.html',
       'tracing/value/ui/array_of_numbers_span.html',
+      'tracing/value/ui/composition_span.html',
       'tracing/value/ui/diagnostic_span.html',
       'tracing/value/ui/generic_diagnostic_span.html',
       'tracing/value/ui/generic_table_view.html',
       'tracing/value/ui/histogram_span.html',
+      'tracing/value/ui/iteration_info_span.html',
+      'tracing/value/ui/numeric_stats_span.html',
       'tracing/value/ui/preferred_display_unit.html',
       'tracing/value/ui/related_event_set_span.html',
       'tracing/value/ui/related_value_map_span.html',
       'tracing/value/ui/related_value_set_span.html',
       'tracing/value/ui/scalar_span.html',
       'tracing/value/ui/value_set_table.html',
       'tracing/value/ui/value_set_view.html',
       'tracing/value/unit.html',
       'tracing/value/unit_scale.html',
       'tracing/value/value.html',
       'tracing/value/value_set.html',
     ],
     'tracing_img_files': [
       'tracing/ui/extras/chrome/cc/images/input-event.png',
       'tracing/ui/extras/chrome/gpu/images/checkerboard.png',
       'tracing/ui/images/chrome-left.png',
       'tracing/ui/images/chrome-mid.png',
       'tracing/ui/images/chrome-right.png',
       'tracing/ui/images/ui-states.png',
     ],
     'tracing_files': [
       '<@(tracing_css_files)',
       '<@(tracing_js_html_files)',
       '<@(tracing_img_files)',
     ],
   }
 }