Refactor Histogram relationship diagnostics.

tracing/tracing/value/histogram_unittest.py

Index: tracing/tracing/value/histogram_unittest.py
diff --git a/tracing/tracing/value/histogram_unittest.py b/tracing/tracing/value/histogram_unittest.py
index f6fcee3ec819b2a625f7c45dbdc3ea220dadd0ae..829f1d8feec7748ce3d82123271a3e1fb10a4624 100644
--- a/tracing/tracing/value/histogram_unittest.py
+++ b/tracing/tracing/value/histogram_unittest.py
@@ -655,20 +655,6 @@ class RelatedEventSetUnittest(unittest.TestCase):
     self.assertEqual(event['duration'], 1)
 
 
-class RelatedHistogramBreakdownUnittest(unittest.TestCase):
-  def testRoundtrip(self):
-    breakdown = histogram.RelatedHistogramBreakdown()
-    hista = histogram.Histogram('a', 'unitless')
-    histb = histogram.Histogram('b', 'unitless')
-    breakdown.Add(hista)
-    breakdown.Add(histb)
-    d = breakdown.AsDict()
-    clone = diagnostic.Diagnostic.FromDict(d)
-    self.assertEqual(ToJSON(d), ToJSON(clone.AsDict()))
-    self.assertEqual(hista.guid, clone.Get('a').guid)
-    self.assertEqual(histb.guid, clone.Get('b').guid)
-
-
 class DateRangeUnittest(unittest.TestCase):
   def testRoundtrip(self):
     dr = histogram.DateRange(1496693745000)
@@ -817,8 +803,7 @@ class DiagnosticMapUnittest(unittest.TestCase):
     })
     generic = histogram.GenericSet(['generic diagnostic'])
     generic2 = histogram.GenericSet(['generic diagnostic 2'])
-    related_map = histogram.RelatedHistogramMap()
-    related_map.Set('a', histogram.Histogram('histogram', 'count'))
+    date_range = histogram.DateRange(15e11)
 
     hist = histogram.Histogram('', 'count')
 
@@ -839,13 +824,13 @@ class DiagnosticMapUnittest(unittest.TestCase):
     # Merging unmergeable diagnostics should produce an
     # UnmergeableDiagnosticSet.
     hist4 = histogram.Histogram('', 'count')
-    hist4.diagnostics['a'] = related_map
+    hist4.diagnostics['a'] = date_range
     hist.diagnostics.Merge(hist4.diagnostics, hist, hist4)
     self.assertIsInstance(
         hist.diagnostics['a'], histogram.UnmergeableDiagnosticSet)
     diagnostics = list(hist.diagnostics['a'])
     self.assertIs(generic, diagnostics[0])
-    self.assertIs(related_map, diagnostics[1])
+    self.assertIs(date_range, diagnostics[1])
 
     # UnmergeableDiagnosticSets are mergeable.
     hist5 = histogram.Histogram('', 'count')
@@ -856,6 +841,6 @@ class DiagnosticMapUnittest(unittest.TestCase):
         hist.diagnostics['a'], histogram.UnmergeableDiagnosticSet)
     diagnostics = list(hist.diagnostics['a'])
     self.assertIs(generic, diagnostics[0])
-    self.assertIs(related_map, diagnostics[1])
+    self.assertIs(date_range, diagnostics[1])
     self.assertIs(events, diagnostics[2])
     self.assertIs(generic2, diagnostics[3])