DeviceInfo into GenericSets

tracing/tracing/value/histogram_set_test.html

Index: tracing/tracing/value/histogram_set_test.html
diff --git a/tracing/tracing/value/histogram_set_test.html b/tracing/tracing/value/histogram_set_test.html
index d93cbdd08466d7c0954be78362ae5905fb2f3fb0..0009bbe6332300d6f72e55b352c1919d34c39425 100644
--- a/tracing/tracing/value/histogram_set_test.html
+++ b/tracing/tracing/value/histogram_set_test.html
@@ -247,12 +247,6 @@ tr.b.unittest.testSuite(function() {
     const buildbotB = new tr.v.d.BuildbotInfo({
       buildbotName: 'bot B',
     });
-    const deviceA = new tr.v.d.DeviceInfo({
-      osName: 'A',
-    });
-    const deviceB = new tr.v.d.DeviceInfo({
-      osName: 'B',
-    });
 
     const aHist = new tr.v.Histogram('a', tr.b.Unit.byName.count);
     const telemetry0 = new tr.v.d.MergedTelemetryInfo();
@@ -263,10 +257,6 @@ tr.b.unittest.testSuite(function() {
     buildbot0.addDiagnostic(buildbotA);
     buildbot0.addDiagnostic(buildbotB);
     buildbot0.addToHistogram(aHist);
-    const device0 = new tr.v.d.MergedDeviceInfo();
-    device0.addDiagnostic(deviceA);
-    device0.addDiagnostic(deviceB);
-    device0.addToHistogram(aHist);
 
     const bHist = new tr.v.Histogram('b', tr.b.Unit.byName.count);
     const telemetry1 = new tr.v.d.MergedTelemetryInfo();
@@ -277,10 +267,6 @@ tr.b.unittest.testSuite(function() {
     buildbot1.addDiagnostic(buildbotA);
     buildbot1.addDiagnostic(buildbotB);
     buildbot1.addToHistogram(bHist);
-    const device1 = new tr.v.d.MergedDeviceInfo();
-    device1.addDiagnostic(deviceA);
-    device1.addDiagnostic(deviceB);
-    device1.addToHistogram(bHist);
 
     const histograms = new tr.v.HistogramSet([aHist, bHist]);
     assert.notStrictEqual(
@@ -289,12 +275,6 @@ tr.b.unittest.testSuite(function() {
     assert.isTrue(
         tr.v.d.TelemetryInfo.getFromHistogram(aHist).equals(
             tr.v.d.TelemetryInfo.getFromHistogram(bHist)));
-    assert.notStrictEqual(
-        tr.v.d.DeviceInfo.getFromHistogram(aHist),
-        tr.v.d.DeviceInfo.getFromHistogram(bHist));
-    assert.isTrue(
-        tr.v.d.DeviceInfo.getFromHistogram(aHist).equals(
-            tr.v.d.DeviceInfo.getFromHistogram(bHist)));
     assert.notStrictEqual(
         tr.v.d.BuildbotInfo.getFromHistogram(aHist),
         tr.v.d.BuildbotInfo.getFromHistogram(bHist));
@@ -307,9 +287,6 @@ tr.b.unittest.testSuite(function() {
     assert.strictEqual(
         tr.v.d.TelemetryInfo.getFromHistogram(aHist),
         tr.v.d.TelemetryInfo.getFromHistogram(bHist));
-    assert.strictEqual(
-        tr.v.d.DeviceInfo.getFromHistogram(aHist),
-        tr.v.d.DeviceInfo.getFromHistogram(bHist));
     assert.strictEqual(
         tr.v.d.BuildbotInfo.getFromHistogram(aHist),
         tr.v.d.BuildbotInfo.getFromHistogram(bHist));
@@ -323,9 +300,6 @@ tr.b.unittest.testSuite(function() {
     assert.strictEqual(
         tr.v.d.TelemetryInfo.getFromHistogram(aHist2),
         tr.v.d.TelemetryInfo.getFromHistogram(bHist2));
-    assert.strictEqual(
-        tr.v.d.DeviceInfo.getFromHistogram(aHist2),
-        tr.v.d.DeviceInfo.getFromHistogram(bHist2));
     assert.strictEqual(
         tr.v.d.BuildbotInfo.getFromHistogram(aHist2),
         tr.v.d.BuildbotInfo.getFromHistogram(bHist2));