autocomplete: add ability to get full address (hidden behind a flag).

third_party/libaddressinput/libaddressinput.gyp

Index: third_party/libaddressinput/libaddressinput.gyp
diff --git a/third_party/libaddressinput/libaddressinput.gyp b/third_party/libaddressinput/libaddressinput.gyp
index 24d25bc7c080b32b97032a60bc70345de5bd6092..9121a8f25706a5a91e878d213f6399243fe4b31d 100644
--- a/third_party/libaddressinput/libaddressinput.gyp
+++ b/third_party/libaddressinput/libaddressinput.gyp
@@ -41,8 +41,8 @@
         '../../build/grit_target.gypi',
       ],
     },
-    {
-      'target_name': 'libaddressinput',
+    # This target provides basic functionality which is cooked into the build.
+    { 'target_name': 'libaddressinput_util',
       'type': 'static_library',
       'include_dirs': [
         '<(libaddressinput_dir)/cpp/include/',
@@ -50,18 +50,9 @@
       ],
       'sources': [
         'chromium/canonicalize_string.cc',
-        'chromium/chrome_downloader_impl.cc',
-        'chromium/chrome_downloader_impl.h',
-        'chromium/chrome_storage_impl.cc',
-        'chromium/chrome_storage_impl.h',
         'chromium/json.cc',
         '<(libaddressinput_dir)/cpp/include/libaddressinput/address_data.h',
         '<(libaddressinput_dir)/cpp/include/libaddressinput/address_field.h',
-        '<(libaddressinput_dir)/cpp/include/libaddressinput/address_problem.h',
-        '<(libaddressinput_dir)/cpp/include/libaddressinput/address_ui_component.h',
-        '<(libaddressinput_dir)/cpp/include/libaddressinput/address_ui.h',
-        '<(libaddressinput_dir)/cpp/include/libaddressinput/address_validator.h',
-        '<(libaddressinput_dir)/cpp/include/libaddressinput/load_rules_delegate.h',
         '<(libaddressinput_dir)/cpp/include/libaddressinput/util/basictypes.h',
         '<(libaddressinput_dir)/cpp/include/libaddressinput/util/internal/basictypes.h',
         '<(libaddressinput_dir)/cpp/include/libaddressinput/util/internal/move.h',
@@ -70,6 +61,53 @@
         '<(libaddressinput_dir)/cpp/include/libaddressinput/util/scoped_ptr.h',
         '<(libaddressinput_dir)/cpp/src/address_data.cc',
         '<(libaddressinput_dir)/cpp/src/address_field.cc',
+        '<(libaddressinput_dir)/cpp/src/region_data_constants.cc',
+        '<(libaddressinput_dir)/cpp/src/region_data_constants.h',
+        '<(libaddressinput_dir)/cpp/src/rule.cc',
+        '<(libaddressinput_dir)/cpp/src/rule.h',
+        '<(libaddressinput_dir)/cpp/src/util/canonicalize_string.h',
+        '<(libaddressinput_dir)/cpp/src/util/json.h',
+        '<(libaddressinput_dir)/cpp/src/util/stl_util.h',
+        '<(libaddressinput_dir)/cpp/src/util/string_util.cc',
+        '<(libaddressinput_dir)/cpp/src/util/string_util.h',
+      ],
+      'dependencies': [
+        'libaddressinput_strings',
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/base/base.gyp:base_i18n',
+        '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
+        '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+        '<(DEPTH)/third_party/re2/re2.gyp:re2',
+      ],
+      'direct_dependent_settings': {
+        'defines': [
+          'CUSTOM_BASICTYPES="base/basictypes.h"',
+          'CUSTOM_SCOPED_PTR="base/memory/scoped_ptr.h"',
+        ],
+        'include_dirs': [
+          '<(libaddressinput_dir)/cpp/include/',
+        ],
+      },
+    },
+    # This target provides more complicated functionality like pinging servers
+    # for validation rules.
+    {
+      'target_name': 'libaddressinput',
+      'type': 'static_library',
+      'include_dirs': [
+        '<(libaddressinput_dir)/cpp/include/',
+        '<(SHARED_INTERMEDIATE_DIR)/libaddressinput/',
+      ],
+      'sources': [
+        'chromium/chrome_downloader_impl.cc',
+        'chromium/chrome_downloader_impl.h',
+        'chromium/chrome_storage_impl.cc',
+        'chromium/chrome_storage_impl.h',
+        '<(libaddressinput_dir)/cpp/include/libaddressinput/address_problem.h',
+        '<(libaddressinput_dir)/cpp/include/libaddressinput/address_ui_component.h',
+        '<(libaddressinput_dir)/cpp/include/libaddressinput/address_ui.h',
+        '<(libaddressinput_dir)/cpp/include/libaddressinput/address_validator.h',
+        '<(libaddressinput_dir)/cpp/include/libaddressinput/load_rules_delegate.h',
         '<(libaddressinput_dir)/cpp/src/address_problem.cc',
         '<(libaddressinput_dir)/cpp/src/address_ui.cc',
         '<(libaddressinput_dir)/cpp/src/address_validator.cc',
@@ -78,21 +116,12 @@
         '<(libaddressinput_dir)/cpp/src/fallback_data_store.cc',
         '<(libaddressinput_dir)/cpp/src/fallback_data_store.h',
         '<(libaddressinput_dir)/cpp/src/grit.h',
-        '<(libaddressinput_dir)/cpp/src/region_data_constants.cc',
-        '<(libaddressinput_dir)/cpp/src/region_data_constants.h',
         '<(libaddressinput_dir)/cpp/src/retriever.cc',
         '<(libaddressinput_dir)/cpp/src/retriever.h',
-        '<(libaddressinput_dir)/cpp/src/rule.cc',
-        '<(libaddressinput_dir)/cpp/src/rule.h',
         '<(libaddressinput_dir)/cpp/src/ruleset.cc',
         '<(libaddressinput_dir)/cpp/src/ruleset.h',
-        '<(libaddressinput_dir)/cpp/src/util/canonicalize_string.h',
-        '<(libaddressinput_dir)/cpp/src/util/json.h',
         '<(libaddressinput_dir)/cpp/src/util/md5.cc',
         '<(libaddressinput_dir)/cpp/src/util/md5.h',
-        '<(libaddressinput_dir)/cpp/src/util/stl_util.h',
-        '<(libaddressinput_dir)/cpp/src/util/string_util.cc',
-        '<(libaddressinput_dir)/cpp/src/util/string_util.h',
         '<(libaddressinput_dir)/cpp/src/util/trie.cc',
         '<(libaddressinput_dir)/cpp/src/util/trie.h',
       ],
@@ -101,6 +130,7 @@
       ],
       'dependencies': [
         'libaddressinput_strings',
+        'libaddressinput_util',
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:base_i18n',
         '<(DEPTH)/third_party/icu/icu.gyp:icui18n',