Reland of Enable whitelist generation for official builds.

tools/grit/grit/format/data_pack.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Support for formatting a data pack file used for platform agnostic resource
 files.
 """
 
 import collections
@@ skipping 91 matching lines @@
   return ''.join(ret)
 
 
 def WriteDataPack(resources, output_file, encoding):
   """Writes a map of id=>data into output_file as a data pack."""
   content = WriteDataPackToString(resources, encoding)
   with open(output_file, 'wb') as file:
     file.write(content)
 
 
-def RePack(output_file, input_files, whitelist_file=None):
+def RePack(output_file, input_files, whitelist_file=None,
+           suppress_removed_key_output=False):
   """Write a new data pack file by combining input pack files.
 
   Args:
       output_file: path to the new data pack file.
       input_files: a list of paths to the data pack files to combine.
       whitelist_file: path to the file that contains the list of resource IDs
                       that should be kept in the output file or None to include
                       all resources.
+      suppress_removed_key_output: allows the caller to suppress the output from
+                                   RePackFromDataPackStrings.
 
   Raises:
       KeyError: if there are duplicate keys or resource encoding is
       inconsistent.
   """
   input_data_packs = [ReadDataPack(filename) for filename in input_files]
   whitelist = None
   if whitelist_file:
     whitelist = util.ReadFile(whitelist_file, util.RAW_TEXT).strip().split('\n')
     whitelist = set(map(int, whitelist))
-  resources, encoding = RePackFromDataPackStrings(input_data_packs, whitelist)
+  resources, encoding = RePackFromDataPackStrings(
+      input_data_packs, whitelist, suppress_removed_key_output)
   WriteDataPack(resources, output_file, encoding)
 
 
-def RePackFromDataPackStrings(inputs, whitelist):
+def RePackFromDataPackStrings(inputs, whitelist,
+                              suppress_removed_key_output=False):
   """Returns a data pack string that combines the resources from inputs.
 
   Args:
       inputs: a list of data pack strings that need to be combined.
       whitelist: a list of resource IDs that should be kept in the output string
                  or None to include all resources.
+      suppress_removed_key_output: Do not print removed keys.
 
   Returns:
       DataPackContents: a tuple containing the new combined data pack and its
                         encoding.
 
   Raises:
       KeyError: if there are duplicate keys or resource encoding is
       inconsistent.
   """
   resources = {}
@@ skipping 11 matching lines @@
       raise exceptions.KeyError('Inconsistent encodings: ' + str(encoding) +
                                 ' vs ' + str(content.encoding))
 
     if whitelist:
       whitelisted_resources = dict([(key, content.resources[key])
                                     for key in content.resources.keys()
                                     if key in whitelist])
       resources.update(whitelisted_resources)
       removed_keys = [key for key in content.resources.keys()
                       if key not in whitelist]
-      for key in removed_keys:
-        print 'RePackFromDataPackStrings Removed Key:', key
+      if not suppress_removed_key_output:
+        for key in removed_keys:
+          print 'RePackFromDataPackStrings Removed Key:', key
     else:
       resources.update(content.resources)
 
   # Encoding is 0 for BINARY, 1 for UTF8 and 2 for UTF16
   if encoding is None:
     encoding = BINARY
   return DataPackContents(resources, encoding)
 
 
 # Temporary hack for external programs that import data_pack.
@@ skipping 18 matching lines @@
     # Just write a simple file.
     data = {1: '', 4: 'this is id 4', 6: 'this is id 6', 10: ''}
     WriteDataPack(data, 'datapack1.pak', UTF8)
     data2 = {1000: 'test', 5: 'five'}
     WriteDataPack(data2, 'datapack2.pak', UTF8)
     print 'wrote datapack1 and datapack2 to current directory.'
 
 
 if __name__ == '__main__':
   main()