Cleanup: Remove unneeded grit include in chrome.

tools/unused-grit-header.py

 #!/usr/bin/env 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.
 
 """A tool to scan source files for unneeded grit includes."""
 
 import os
 import sys
 import xml.etree.ElementTree
@@ skipping 60 matching lines @@
     grd_file: The file that contains the XML tree.
 
   Returns:
     A list of resource names.
   """
   root = tree.getroot()
   assert root.tag == 'grit'
   release_node = FindNodeWithTag(root, 'release')
   assert release_node != None
 
-  messages_node = FindNodeWithTag(release_node, 'messages')
-  messages = set()
-  if messages_node != None:
-    messages = set(GetResourcesForNode(messages_node, grd_file, 'message'))
-
-  includes_node = FindNodeWithTag(release_node, 'includes')
-  includes = set()
-  if includes_node != None:
-    includes = set(GetResourcesForNode(includes_node, grd_file, 'include'))
-  return messages.union(includes)
+  resources = set()
+  for node_type in ('message', 'include', 'structure'):
+    resources_node = FindNodeWithTag(release_node, node_type + 's')
+    if resources_node != None:
+      resources = resources.union(
+          set(GetResourcesForNode(resources_node, grd_file, node_type)))
+  return resources
 
 
 def GetOutputFileForNode(node):
   """Find the output file starting from a given node.
 
   Args:
     node: The root node to scan from.
 
   Returns:
     A grit header file name.
@@ skipping 42 matching lines @@
   """Return whether a file needs a given grit header or not.
 
   Args:
     grit_header: The grit header file name.
     resources: The list of resource names in grit_header.
     filename: The file to scan.
 
   Returns:
     True if the file should include the grit header.
   """
+  # A list of special keywords that implies the file needs grit headers.
+  # To be more thorough, one would need to run a pre-processor.
+  SPECIAL_KEYWORDS = (
+      'IMAGE_GRID(',  # Macro in nine_image_painter_factory.h

[tfarina, 2014/08/29 17:55:54]

https://chromium.googlesource.com/chromium/src/+/master/tools/resources/find_...
has some logic for this particular case.

+      '#include "ui_localizer_table.h"',  # ui_localizer.mm
+      'DEFINE_RESOURCE_ID',  # chrome/browser/android/resource_mapper.cc
+      )
   with open(filename, 'rb') as f:
     grit_header_line = grit_header + '"\n'
     has_grit_header = False
     while True:
       line = f.readline()
       if not line:
         break
       if line.endswith(grit_header_line):
         has_grit_header = True
         break
 
     if not has_grit_header:
       return True
     rest_of_the_file = f.read()
-    return any(resource in rest_of_the_file for resource in resources)
+    return (any(resource in rest_of_the_file for resource in resources) or
+            any(keyword in rest_of_the_file for keyword in SPECIAL_KEYWORDS))
 
 
 def main(argv):
   if len(argv) < 3:
     Usage(argv[0])
     return 1
   grd_file = argv[1]
   dirs_to_scan = argv[2:]
   for f in dirs_to_scan:
     if not os.path.exists(f):
@@ skipping 17 matching lines @@
           [f for f in full_paths
            if not NeedsGritInclude(grit_header, resources, f)])
   if files_with_unneeded_grit_includes:
     print '\n'.join(files_with_unneeded_grit_includes)
     return 2
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))