Reland "Use upstream libaddressinput in Chrome."

chrome/tools/build/repack_locales.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.
 
 """Helper script to repack paks for a list of locales.
 
 Gyp doesn't have any built-in looping capability, so this just provides a way to
 loop over a list of locales when repacking pak files, thus avoiding a
 proliferation of mostly duplicate, cut-n-paste gyp actions.
@@ skipping 93 matching lines @@
 
     # For example:
     # '<(SHARED_INTERMEDIATE_DIR)/extensions/strings/extensions_strings_da.pak
     # TODO(jamescook): When Android stops building extensions code move this
     # to the OS != 'ios' and OS != 'android' section below.
     inputs.append(os.path.join(SHARE_INT_DIR, 'extensions', 'strings',
                   'extensions_strings_%s.pak' % locale))
 
   if ENABLE_AUTOFILL_DIALOG and OS != 'ios' and OS != 'android':
     #e.g. '<(SHARED_INTERMEDIATE_DIR)/third_party/libaddressinput/
-    # libaddressinput_strings_da.pak',
+    # address_input_strings_da.pak',
     inputs.append(os.path.join(SHARE_INT_DIR, 'third_party', 'libaddressinput',
-                               'libaddressinput_strings_%s.pak' % locale))
-
-    #e.g. '<(SHARED_INTERMEDIATE_DIR)/grit/libaddressinput/
-    # address_input_strings_da.pak',
-    inputs.append(os.path.join(SHARE_INT_DIR, 'grit', 'libaddressinput',
                                'address_input_strings_%s.pak' % locale))
 
   #e.g. '<(grit_out_dir)/google_chrome_strings_da.pak'
   #     or
   #     '<(grit_out_dir)/chromium_strings_da.pak'
   inputs.append(os.path.join(
       GRIT_DIR, '%s_strings_%s.pak' % (BRANDING, locale)))
 
   # Add any extra input files.
   for extra_file in EXTRA_INPUT_FILES:
@@ skipping 115 matching lines @@
 
   if print_outputs:
     return list_outputs(locales)
 
   return repack_locales(locales)
 
 if __name__ == '__main__':
   results = DoMain(sys.argv[1:])
   if results:
     print results