Delete TelemetryInfo, MergedTelemetryInfo diagnostics.

telemetry/telemetry/internal/results/page_test_results_unittest.py

 # Copyright 2014 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.
 
 import os
 import unittest
 
 from telemetry import benchmark
 from telemetry import story
 from telemetry.internal.results import base_test_results_unittest
@@ skipping 407 matching lines @@
         '{\n  \"enabled\": false,\n  ' +
         '\"benchmark_name\": \"benchmark_name\"\n}\n')
 
   def testAddSharedDiagnostic(self):
     results = page_test_results.PageTestResults()
     results.telemetry_info.benchmark_start_epoch = 1501773200
     results.WillRunPage(self.pages[0])
     results.DidRunPage(self.pages[0])
     results.CleanUp()
     results.histograms.AddSharedDiagnostic(
-        reserved_infos.TELEMETRY.name,
-        histogram_module.TelemetryInfo())
+        reserved_infos.BENCHMARKS.name,
+        histogram_module.GenericSet(['benchmark_name']))
 
     benchmark_metadata = benchmark.BenchmarkMetadata(
         'benchmark_name', 'benchmark_description')
     results.PopulateHistogramSet(benchmark_metadata)
 
     histogram_dicts = results.AsHistogramDicts()
     self.assertEquals(1, len(histogram_dicts))
 
     diag = diagnostic.Diagnostic.FromDict(histogram_dicts[0])
-    self.assertIsInstance(diag, histogram_module.TelemetryInfo)
+    self.assertIsInstance(diag, histogram_module.GenericSet)
 
   def testPopulateHistogramSet_UsesScalarValueData(self):
     results = page_test_results.PageTestResults()
     results.telemetry_info.benchmark_start_epoch = 1501773200
     results.WillRunPage(self.pages[0])
     results.AddValue(scalar.ScalarValue(
         self.pages[0], 'a', 'seconds', 3,
         improvement_direction=improvement_direction.UP))
     results.DidRunPage(self.pages[0])
     results.CleanUp()
 
     benchmark_metadata = benchmark.BenchmarkMetadata(
         'benchmark_name', 'benchmark_description')
     results.PopulateHistogramSet(benchmark_metadata)
 
     histogram_dicts = results.AsHistogramDicts()
     self.assertEquals(1, len(histogram_dicts))
 
     h = histogram_module.Histogram.FromDict(histogram_dicts[0])
     self.assertEquals('a', h.name)
 
   def testPopulateHistogramSet_UsesHistogramSetData(self):
-    original_diagnostic = histogram_module.TelemetryInfo()
+    original_diagnostic = histogram_module.GenericSet(['benchmark_name'])
 
     results = page_test_results.PageTestResults()
     results.telemetry_info.benchmark_start_epoch = 1501773200
     results.WillRunPage(self.pages[0])
     results.histograms.AddHistogram(histogram_module.Histogram('foo', 'count'))
     results.histograms.AddSharedDiagnostic(
-        reserved_infos.TELEMETRY.name, original_diagnostic)
+        reserved_infos.BENCHMARKS.name, original_diagnostic)
     results.DidRunPage(self.pages[0])
     results.CleanUp()
 
     benchmark_metadata = benchmark.BenchmarkMetadata(
         'benchmark_name', 'benchmark_description')
     results.PopulateHistogramSet(benchmark_metadata)
 
     histogram_dicts = results.AsHistogramDicts()
     self.assertEquals(2, len(histogram_dicts))
 
     hs = histogram_set.HistogramSet()
     hs.ImportDicts(histogram_dicts)
 
     diag = hs.LookupDiagnostic(original_diagnostic.guid)
-    self.assertIsInstance(diag, histogram_module.TelemetryInfo)
+    self.assertIsInstance(diag, histogram_module.GenericSet)
 
 
 class PageTestResultsFilterTest(unittest.TestCase):
   def setUp(self):
     story_set = story.StorySet(base_dir=os.path.dirname(__file__))
     story_set.AddStory(
         page_module.Page('http://www.foo.com/', story_set, story_set.base_dir,
                          name='http://www.foo.com'))
     story_set.AddStory(
         page_module.Page('http://www.bar.com/', story_set, story_set.base_dir,
@@ skipping 112 matching lines @@
         self.pages[0], 'b', 'seconds', 8,
         improvement_direction=improvement_direction.UP))
     results.AddValue(skip_value)
     results.DidRunPage(self.pages[0])
     results.PrintSummary()
 
     # Although predicate says only accept value with named 'a', skip value is
     # added anyway.
     self.assertEquals(len(results.all_page_specific_values), 1)
     self.assertIn(skip_value, results.all_page_specific_values)