supersize: Add Print(idx). Sort subgroups in canned_queries.

tools/binary_size/libsupersize/canned_queries.py

 # Copyright 2017 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.
 
 """Contains a set of Chrome-specific size queries."""
 
 import logging
 import models
 
 
 class _Grouper(object):
   def __init__(self):
     self.groups = []
 
   def Add(self, name, group):
     logging.debug('Computed %s', name)
-    group.name = name
-    self.groups.append(group)
+    sorted_group = group.Sorted()
+    sorted_group.SetName(name)
+    self.groups.append(sorted_group)
     return group.Inverted()
 
   def Finalize(self, remaining):
     self.groups.sort(key=lambda s:(s.name.startswith('Other'), -s.pss))
     if remaining:
       stars = remaining.Filter(lambda s: s.name.startswith('*'))
       if stars:
         remaining = stars.Inverted()
-        stars.name = '** Merged Symbols'
+        stars = stars.Sorted()
+        stars.SetName('** Merged Symbols')
         self.groups.append(stars)
-      remaining.name = 'Other'
+      remaining.SetName('Other')
       self.groups.append(remaining)
 
     logging.debug('Finalized')
     return models.SymbolGroup(self.groups, is_sorted=True)
 
 
 def _CategorizeByChromeComponent(symbols):
   g = _Grouper()
 
   # Put things that filter out a lot of symbols at the beginning where possible
@@ skipping 96 matching lines @@
     """Categorizes symbols that come from generated source files."""
     return _CategorizeGenerated(self._SymbolsArg(symbols))
 
   def CategorizeByChromeComponent(self, symbols=None):
     """Groups symbols by component using predefined queries."""
     return _CategorizeByChromeComponent(self._SymbolsArg(symbols))
 
   def TemplatesByName(self, symbols=None, depth=0):
     """Lists C++ templates grouped by name."""
     symbols = self._SymbolsArg(symbols)
+    # Call Sorted() twice so that subgroups will be sorted.
     # TODO(agrieve): Might be nice to recursively GroupedByName() on these.
-    return symbols.WhereIsTemplate().GroupedByName(depth).Sorted()
+    return symbols.WhereIsTemplate().Sorted().GroupedByName(depth).Sorted()