DeviceInfo into GenericSets

tracing/trace_viewer.gypi

Index: tracing/trace_viewer.gypi
diff --git a/tracing/trace_viewer.gypi b/tracing/trace_viewer.gypi
index 405b6dde26cc7ad424179a5e836b57f20f4fe89c..af8414a505f2d512929f7e6cc327652d3379ce79 100644
--- a/tracing/trace_viewer.gypi
+++ b/tracing/trace_viewer.gypi
@@ -532,7 +532,6 @@
       'tracing/value/diagnostics/buildbot_info.html',
       'tracing/value/diagnostics/collected_related_event_set.html',
       'tracing/value/diagnostics/date_range.html',
-      'tracing/value/diagnostics/device_info.html',
       'tracing/value/diagnostics/diagnostic.html',
       'tracing/value/diagnostics/diagnostic_map.html',
       'tracing/value/diagnostics/diagnostic_ref.html',
@@ -541,7 +540,6 @@
       'tracing/value/diagnostics/grouping_path.html',
       'tracing/value/diagnostics/histogram_ref.html',
       'tracing/value/diagnostics/merged_buildbot_info.html',
-      'tracing/value/diagnostics/merged_device_info.html',
       'tracing/value/diagnostics/merged_revision_info.html',
       'tracing/value/diagnostics/merged_telemetry_info.html',
       'tracing/value/diagnostics/related_event_set.html',
@@ -563,7 +561,6 @@
       'tracing/value/ui/buildbot_info_span.html',
       'tracing/value/ui/collected_related_event_set_span.html',
       'tracing/value/ui/date_range_span.html',
-      'tracing/value/ui/device_info_span.html',
       'tracing/value/ui/diagnostic_map_table.html',
       'tracing/value/ui/diagnostic_span.html',
       'tracing/value/ui/generic_set_span.html',
@@ -576,7 +573,6 @@
       'tracing/value/ui/histogram_set_view_state.html',
       'tracing/value/ui/histogram_span.html',
       'tracing/value/ui/merged_buildbot_info_span.html',
-      'tracing/value/ui/merged_device_info_span.html',
       'tracing/value/ui/merged_revision_info_span.html',
       'tracing/value/ui/merged_telemetry_info_span.html',
       'tracing/value/ui/preferred_display_unit.html',