Fix regex to parse Variations UI override strings

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
 import re
 import sys
 
 SCRIPT_NAME = "generate_ui_string_overrider.py"
+
+
+# Regular expressions for parsing the #define macro format. Separate regular
+# expressions are used for parsing lines with pragma (for builds with
+# enable_resource_whitelist_generation flag) in windows and non-windows, and for
+# lines without pragma, For example,
+# Without generate whitelist flag:
+#   #define IDS_FOO_MESSAGE 1234
+# With generate whitelist flag in non-windows:
+#   #define IDS_FOO_MESSAGE _Pragma("whitelisted_resource_1234") 1234
+# With generate whitelist flag in windows:
+#   #define IDS_FOO_MESSAGE __pragma(message("whitelisted_resource_1234")) 1234
 RESOURCE_EXTRACT_REGEX = re.compile('^#define (\S*) (\d*)$', re.MULTILINE)
+RESOURCE_EXTRACT_REGEX_PRAGMA = re.compile(
+      '^#define (\S*) _Pragma\("whitelisted_resource_\d*"\) (\d*)$',
+      re.MULTILINE)
+RESOURCE_EXTRACT_REGEX_PRAGMA_WINDOWS = re.compile(
+      '^#define (\S*) __pragma\(message\("whitelisted_resource_\d*"\)\) (\d*)$',
+      re.MULTILINE)
 
 class Error(Exception):
   """Base error class for all exceptions in generated_resources_map."""
 
 
 class HashCollisionError(Error):
   """Multiple resource names hash to the same value."""
 
 
 Resource = collections.namedtuple("Resource", ['hash', 'name', 'index'])
@@ skipping 20 matching lines @@
   an iterator over all matching (NAME, INDEX) pairs.
 
   Args:
     string_to_scan: The input string to scan.
 
   Yields:
     A tuple of name and index.
   """
   for match in RESOURCE_EXTRACT_REGEX.finditer(string_to_scan):
     yield match.group(1, 2)
+  for match in RESOURCE_EXTRACT_REGEX_PRAGMA.finditer(string_to_scan):
+    yield match.group(1, 2)
+  for match in RESOURCE_EXTRACT_REGEX_PRAGMA_WINDOWS.finditer(string_to_scan):
+    yield match.group(1, 2)
 
 
 def _GetResourceListFromString(resources_content):
   """Produces a list of |Resource| objects from a string.
 
   The input string contains lines of the form "#define NAME INDEX". The returned
   list is sorted primarily by hash, then name, and then index.
 
   Args:
     resources_content: The input string to process, contains lines of the form
@@ skipping 222 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())