Variations string overrides now handles more .grd files

components/variations/service/generate_ui_string_overrider.py

 #!/usr/bin/python
 # 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 argparse
 import collections
 import hashlib
 import operator
 import os
@@ skipping 53 matching lines @@
   Args:
     resources_content: The input string to process, contains lines of the form
         "#define NAME INDEX".
 
   Returns:
     A sorted list of |Resource| objects.
   """
   resources = [Resource(_HashName(name), name, index) for name, index in
                _GetNameIndexPairsIter(resources_content)]
 
+  # Deduplicate resources. Some name-index pairs appear in multiple header
+  # files. Unless deduplicated here, collisions will be raised in _CheckForHashCollisions

[jwd, 2015/10/26 15:11:15]

Nit: line too long.

[Moe, 2015/10/26 16:23:52]

Done.

+  resources = list(set(resources))
+
   # The default |Resource| order makes |resources| sorted by the hash, then
   # name, then index.
   resources.sort()
 
   return resources
 
 
 def _CheckForHashCollisions(sorted_resource_list):
   """Checks a sorted list of |Resource| objects for hash collisions.
 
@@ skipping 69 matching lines @@
     header_filename: Path to the corresponding .h.
 
   Returns:
     .cc file content implementing the CreateUIStringOverrider() factory.
   """
   hashed_tuples = _GetResourceListFromString(resources_content)
 
   collisions = _CheckForHashCollisions(hashed_tuples)
   if collisions:
     error_message = "\n".join(
-        ["hash: %i, name: %s" % (i[0], i[1]) for i in sorted(collisions)])
+        ["hash: %i, name: %s" % (i.hash, i.name) for i in sorted(collisions)])
     error_message = ("\nThe following names had hash collisions "
                      "(sorted by the hash value):\n%s\n" %(error_message))
     raise HashCollisionError(error_message)
 
   hashes_array = _GenDataArray(
       hashed_tuples, "    %iU,  // %s", 'kResourceHashes', 'uint32_t',
       operator.attrgetter('hash'))
   indices_array = _GenDataArray(
       hashed_tuples, "    %s,  // %s", 'kResourceIndices', 'int',
       operator.attrgetter('index'))
@@ skipping 109 matching lines @@
   with open(os.path.join(
       arguments.output_dir, arguments.source_filename), "w") as generated_file:
     generated_file.write(source_file_content)
   with open(os.path.join(
       arguments.output_dir, arguments.header_filename), "w") as generated_file:
     generated_file.write(header_file_content)
 
 
 if __name__ == '__main__':
   sys.exit(main())