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 f5c753ee3aed055c410ac53dcf11592ce31d2935..4a765a06b249f89fda79cca0ad055074b78b2874 100644
--- a/tracing/trace_viewer.gypi
+++ b/tracing/trace_viewer.gypi
@@ -530,7 +530,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',
@@ -539,7 +538,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',
@@ -561,7 +559,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',
@@ -574,7 +571,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',