libaddressinput - merge LookupKeyUtil into Retriever

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 59 matching lines @@
         '<(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/address_problem.cc',
         '<(libaddressinput_dir)/cpp/src/address_ui.cc',
         '<(libaddressinput_dir)/cpp/src/address_validator.cc',
         '<(libaddressinput_dir)/cpp/src/country_rules_aggregator.cc',
         '<(libaddressinput_dir)/cpp/src/country_rules_aggregator.h',
         '<(libaddressinput_dir)/cpp/src/grit.h',
         '<(libaddressinput_dir)/cpp/src/localization.cc',
-        '<(libaddressinput_dir)/cpp/src/lookup_key_util.cc',
-        '<(libaddressinput_dir)/cpp/src/lookup_key_util.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/json.h',
         '<(libaddressinput_dir)/cpp/src/util/md5.cc',
@@ skipping 31 matching lines @@
         'chromium/chrome_downloader_impl_unittest.cc',
         'chromium/chrome_storage_impl_unittest.cc',
         '<(libaddressinput_dir)/cpp/test/address_ui_test.cc',
         '<(libaddressinput_dir)/cpp/test/fake_downloader.cc',
         '<(libaddressinput_dir)/cpp/test/fake_downloader.h',
         '<(libaddressinput_dir)/cpp/test/fake_downloader_test.cc',
         '<(libaddressinput_dir)/cpp/test/fake_storage.cc',
         '<(libaddressinput_dir)/cpp/test/fake_storage.h',
         '<(libaddressinput_dir)/cpp/test/fake_storage_test.cc',
         '<(libaddressinput_dir)/cpp/test/localization_test.cc',
-        '<(libaddressinput_dir)/cpp/test/lookup_key_util_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_split_unittest.cc',
         '<(libaddressinput_dir)/cpp/test/validating_util_test.cc',
       ],
       'defines': [
         'TEST_DATA_DIR="third_party/libaddressinput/src/testdata"',
       ],
       'dependencies': [
         'libaddressinput',
         '<(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',
       ],
     },
   ],
 }