Multi-dimension rappor metrics

tools/metrics/rappor/pretty_print.py

 #!/usr/bin/env python
 # Copyright 2015 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 logging
 import sys
 import os
 
 # Import the metrics/common module for pretty print xml.
@@ skipping 33 matching lines @@
     extra_newlines=(1, 1, 1),
     dont_indent=True,
     children=[
       models.ChildType('types', _RAPPOR_PARAMETERS_TYPE, True),
     ])
 
 _OWNER_TYPE = models.TextNodeType('owner', single_line=True)
 
 _RAPPOR_METRIC_TYPE = models.ObjectNodeType('rappor-metric',
     extra_newlines=(1, 1, 1),
-    string_attributes=['name', 'type'],
+    string_attributes=['name', 'type', 'flags'],
     children=[
       models.ChildType('owners', _OWNER_TYPE, True),
       models.ChildType('summary', _SUMMARY_TYPE, False),
     ])
 
 _RAPPOR_METRICS_TYPE = models.ObjectNodeType('rappor-metrics',
     extra_newlines=(1, 1, 1),
     dont_indent=True,
     children=[
       models.ChildType('metrics', _RAPPOR_METRIC_TYPE, True),
     ])
 
+_FLAG_TYPE = models.ObjectNodeType('flag',
+    extra_newlines=(1, 1, 0),
+    string_attributes=['name', 'description'])
+
+_FLAG_SET_TYPE = models.ObjectNodeType('flag-set',
+    extra_newlines=(1, 1, 1),
+    string_attributes=['name'],
+    children=[
+      models.ChildType('flags', _FLAG_TYPE, True),
+    ])
+
+_FLAG_SETS_TYPE = models.ObjectNodeType('flag-sets',
+    extra_newlines=(1, 1, 1),
+    dont_indent=True,
+    children=[
+      models.ChildType('flagSets', _FLAG_SET_TYPE, True),
+    ]
+)
+
 _RAPPOR_CONFIGURATION_TYPE = models.ObjectNodeType('rappor-configuration',
     extra_newlines=(1, 1, 1),
     dont_indent=True,
     children=[
       models.ChildType('parameterTypes', _RAPPOR_PARAMETERS_TYPES_TYPE, False),
+      models.ChildType('flagSets', _FLAG_SETS_TYPE, True),
       models.ChildType('metrics', _RAPPOR_METRICS_TYPE, False),
     ])
 
 RAPPOR_XML_TYPE = models.DocumentType(_RAPPOR_CONFIGURATION_TYPE)
 
 
 def GetTypeNames(config):
   return set(p['name'] for p in config['parameterTypes']['types'])
 
 
@@ skipping 76 matching lines @@
   return RAPPOR_XML_TYPE.PrettyPrint(comments, config)
 
 
 def main(argv):
   presubmit_util.DoPresubmitMain(argv, 'rappor.xml', 'rappor.old.xml',
                                  'pretty_print.py', UpdateXML)
 
 
 if '__main__' == __name__:
   sys.exit(main(sys.argv))