Revision Info into GenericSet

tracing/tracing/value/add_revision_info.py

Index: tracing/tracing/value/add_revision_info.py
diff --git a/tracing/tracing/value/add_revision_info.py b/tracing/tracing/value/add_revision_info.py
index e4f40631c8fd9a083095868ff134e0dec8c69427..9ad9a8b4887a7b02235d94eb5c853128dfb99315 100644
--- a/tracing/tracing/value/add_revision_info.py
+++ b/tracing/tracing/value/add_revision_info.py
@@ -2,23 +2,25 @@
 # Use of this source code is governed by a BSD-style license that can be

[eakuefner, 2017/08/08 21:18:15]

Delete this file.

 # found in the LICENSE file.
 
-import json
-import tempfile
+from tracing.value import histogram
+from tracing.value.diagnostics import reserved_infos
 
-from tracing.value import add_shared_diagnostic
-
-def AddRevisionInfo(histograms_json_filename, chromium, v8, catapult, angle,
-                    skia, webrtc):
+def AddRevisionInfo(histogram_set, chromium_commit, chromium_revisions,
+                    v8_commit, v8_revisions, catapult, angle, skia, webrtc):
+  """Adds a shared diagnostics containing pieces of revision information to a
+     HistogramSet.
+  """
   revision_info = {
-      'chromium': chromium,
-      'v8': v8,
-      'catapult': catapult,
-      'angle': angle,
-      'skia': skia,
-      'webrtc': webrtc,
+      reserved_infos.CHROMIUM_REVISIONS.name: chromium_revisions,
+      reserved_infos.CHROMIUM_COMMIT_POSITIONS.name: [chromium_commit],
+      reserved_infos.V8_REVISIONS.name: v8_revisions,
+      reserved_infos.V8_COMMIT_POSITIONS.name: [v8_commit],
+      reserved_infos.CATAPULT_REVISIONS.name: catapult,
+      reserved_infos.ANGLE_REVISIONS.name: angle,
+      reserved_infos.SKIA_REVISIONS.name: skia,
+      reserved_infos.WEBRTC_REVISIONS.name: webrtc,
   }
 
-  with tempfile.NamedTemporaryFile() as diagnostic_file:
-    json.dump(revision_info, diagnostic_file)
-    return add_shared_diagnostic.AddSharedDiagnostic(
-        histograms_json_filename, 'revisions', diagnostic_file.name)
+  for revision_info_name, revision_info_value in revision_info.iteritems():
+    histogram_set.AddSharedDiagnostic(
+        revision_info_name, histogram.GenericSet(revision_info_value))