Revert of Ignore whitelist when generating android xml. (https://codereview.chromium.org/196923002/)

grit/format/android_xml.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.
 
 """Produces localized strings.xml files for Android.
 
 In cases where an "android" type output file is requested in a grd, the classes
 in android_xml will process the messages and translations to produce a valid
 strings.xml that is properly localized with the specified language.
@@ skipping 94 matching lines @@
   if _TAGGED_ONLY_ENV_VAR in os.environ:
     tagged_only = os.environ[_TAGGED_ONLY_ENV_VAR].lower()
     if tagged_only == 'true':
       tagged_only = True
     elif tagged_only == 'false':
       tagged_only = False
     else:
       raise Exception('env variable ANDROID_JAVA_TAGGED_ONLY must have value '
                       'true or false. Invalid value: %s' % tagged_only)
 
-  for item in root.Preorder():
+  for item in root.ActiveDescendants():
     with item:
       if ShouldOutputNode(item, tagged_only):
         yield _FormatMessage(item, lang)
 
   yield '</resources>\n'
 
 
 def ShouldOutputNode(node, tagged_only):
   """Returns true if node should be outputted.
 
@@ skipping 23 matching lines @@
   product = match.group('product')
 
   # Override product or name with values in formatter_data, if any.
   product = item.formatter_data.get(_PRODUCT_TAG, product)
   name = item.formatter_data.get(_NAME_TAG, name)
 
   if product:
     return _PRODUCT_TEMPLATE % (name, product, value)
   else:
     return _SIMPLE_TEMPLATE % (name, value)