Revert of Determine language code and type of format for address.

third_party/libaddressinput/libaddressinput.gyp

 # Copyright 2013 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.
 {
   'variables': {
     # TODO(rouslan): Use the src/ directory. http://crbug.com/327046
     'libaddressinput_dir': 'chromium',
   },
   'target_defaults': {
     'conditions': [
@@ skipping 68 matching lines @@
         '<(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/time_to_string.cc',
+        '<(libaddressinput_dir)/cpp/src/time_to_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/canonicalize_string.h',
+        '<(libaddressinput_dir)/cpp/src/util/string_compare.cc',
+        '<(libaddressinput_dir)/cpp/src/util/string_compare.h',
+        '<(libaddressinput_dir)/cpp/src/util/string_split.cc',
+        '<(libaddressinput_dir)/cpp/src/util/string_split.h',
         '<(libaddressinput_dir)/cpp/src/util/trie.cc',
         '<(libaddressinput_dir)/cpp/src/util/trie.h',
       ],
       'defines': [
         'VALIDATION_DATA_URL="https://i18napis.appspot.com/ssl-aggregate-address/"',
       ],
       'dependencies': [
         'libaddressinput_strings',
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:base_i18n',
@@ skipping 38 matching lines @@
         '<(libaddressinput_dir)/cpp/test/fallback_data_store_test.cc',
         '<(libaddressinput_dir)/cpp/test/region_data_constants_test.cc',
         '<(libaddressinput_dir)/cpp/test/retriever_test.cc',
         '<(libaddressinput_dir)/cpp/test/rule_test.cc',
         '<(libaddressinput_dir)/cpp/test/storage_test_runner.cc',
         '<(libaddressinput_dir)/cpp/test/storage_test_runner.h',
         '<(libaddressinput_dir)/cpp/test/util/json_test.cc',
         '<(libaddressinput_dir)/cpp/test/util/md5_unittest.cc',
         '<(libaddressinput_dir)/cpp/test/util/scoped_ptr_unittest.cc',
         '<(libaddressinput_dir)/cpp/test/util/stl_util_unittest.cc',
-        '<(libaddressinput_dir)/cpp/test/util/string_util_test.cc',
+        '<(libaddressinput_dir)/cpp/test/util/string_split_unittest.cc',
         '<(libaddressinput_dir)/cpp/test/util/trie_test.cc',
       ],
       'defines': [
         'TEST_DATA_DIR="third_party/libaddressinput/src/testdata"',
       ],
       'dependencies': [
         'libaddressinput',
         'libaddressinput_strings',
         '<(DEPTH)/base/base.gyp:base_prefs',
         '<(DEPTH)/base/base.gyp:run_all_unittests',
         '<(DEPTH)/net/net.gyp:net_test_support',
         '<(DEPTH)/testing/gtest.gyp:gtest',
       ],
     },
   ],
 }