diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-04 14:17:57 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-05 10:05:06 +0000 |
commit | 39d357e3248f80abea0159765ff39554affb40db (patch) | |
tree | aba0e6bfb76de0244bba0f5fdbd64b830dd6e621 /chromium/third_party/libaddressinput | |
parent | 87778abf5a1f89266f37d1321b92a21851d8244d (diff) | |
download | qtwebengine-chromium-39d357e3248f80abea0159765ff39554affb40db.tar.gz |
BASELINE: Update Chromium to 55.0.2883.105
And updates ninja to 1.7.2
Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/third_party/libaddressinput')
7 files changed, 169 insertions, 278 deletions
diff --git a/chromium/third_party/libaddressinput/BUILD.gn b/chromium/third_party/libaddressinput/BUILD.gn index d8a0b01e6fb..5eaa8607bad 100644 --- a/chromium/third_party/libaddressinput/BUILD.gn +++ b/chromium/third_party/libaddressinput/BUILD.gn @@ -6,32 +6,12 @@ import("//testing/test.gni") import("//build/config/locales.gni") import("//tools/grit/grit_rule.gni") -libaddressinput_util_files = [ - "src/cpp/src/address_data.cc", - "src/cpp/src/address_field.cc", - "src/cpp/src/address_field_util.cc", - "src/cpp/src/address_formatter.cc", - "src/cpp/src/address_metadata.cc", - "src/cpp/src/address_ui.cc", - "src/cpp/src/format_element.cc", - "src/cpp/src/language.cc", - "src/cpp/src/localization.cc", - "src/cpp/src/lookup_key.cc", - "src/cpp/src/region_data_constants.cc", - "src/cpp/src/rule.cc", - "src/cpp/src/util/cctype_tolower_equal.cc", - "src/cpp/src/util/json.cc", - "src/cpp/src/util/string_split.cc", - "src/cpp/src/util/string_util.cc", -] - config("no-newline-eof-warning") { if (is_clang) { cflags = [ "-Wno-newline-eof" ] } } -# GYP version: third_party/libaddressinput/libaddressinput.gyp:libaddressinput_strings grit("strings") { source = "//chrome/app/address_input_strings.grd" outputs = [ @@ -57,14 +37,26 @@ config("libaddressinput_config") { } # This target provides basic functionality which is cooked into the build. -# GYP version: third_party/libaddressinput/libaddressinput.gyp:libaddressinput_util static_library("util") { - sources = libaddressinput_util_files - sources += [ + sources = [ "chromium/addressinput_util.cc", "chromium/json.cc", + "src/cpp/src/address_data.cc", + "src/cpp/src/address_field.cc", + "src/cpp/src/address_field_util.cc", + "src/cpp/src/address_formatter.cc", + "src/cpp/src/address_metadata.cc", + "src/cpp/src/address_ui.cc", + "src/cpp/src/format_element.cc", + "src/cpp/src/language.cc", + "src/cpp/src/localization.cc", + "src/cpp/src/lookup_key.cc", + "src/cpp/src/region_data_constants.cc", + "src/cpp/src/rule.cc", + "src/cpp/src/util/cctype_tolower_equal.cc", + "src/cpp/src/util/string_split.cc", + "src/cpp/src/util/string_util.cc", ] - sources -= [ "src/cpp/src/util/json.cc" ] configs -= [ "//build/config/compiler:chromium_code" ] configs += [ @@ -85,81 +77,123 @@ static_library("util") { ] } -if (!is_android || use_aura) { - # The list of files in libaddressinput.gypi. - gypi_values = exec_script("//build/gypi_to_gn.py", - [ rebase_path("src/cpp/libaddressinput.gypi") ], - "scope", - [ "src/cpp/libaddressinput.gypi" ]) - - # This target provides more complicated functionality like pinging servers - # for validation rules. - # GYP version: third_party/libaddressinput/libaddressinput.gyp:libaddressinput - static_library("libaddressinput") { - sources = rebase_path(gypi_values.libaddressinput_files, ".", "src/cpp") - sources += [ - "chromium/chrome_address_validator.cc", - "chromium/chrome_metadata_source.cc", - "chromium/chrome_storage_impl.cc", - "chromium/fallback_data_store.cc", - "chromium/input_suggester.cc", - "chromium/string_compare.cc", - "chromium/trie.cc", - ] - sources -= libaddressinput_util_files - sources -= [ "src/cpp/src/util/string_compare.cc" ] - - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - - public_configs = [ ":libaddressinput_config" ] - - deps = [ - ":strings", - ":util", - "//base", - "//base:i18n", - "//components/prefs", - "//net", - "//third_party/icu", - "//third_party/re2", - ] - } +# This target provides more complicated functionality like pinging servers +# for validation rules. +static_library("libaddressinput") { + sources = [ + "chromium/chrome_address_validator.cc", + "chromium/chrome_metadata_source.cc", + "chromium/chrome_storage_impl.cc", + "chromium/fallback_data_store.cc", + "chromium/input_suggester.cc", + "chromium/string_compare.cc", + "chromium/trie.cc", + "src/cpp/src/address_input_helper.cc", + "src/cpp/src/address_normalizer.cc", + "src/cpp/src/address_problem.cc", + "src/cpp/src/address_validator.cc", + "src/cpp/src/null_storage.cc", + "src/cpp/src/ondemand_supplier.cc", + "src/cpp/src/ondemand_supply_task.cc", + "src/cpp/src/post_box_matchers.cc", + "src/cpp/src/preload_supplier.cc", + "src/cpp/src/region_data.cc", + "src/cpp/src/region_data_builder.cc", + "src/cpp/src/retriever.cc", + "src/cpp/src/rule_retriever.cc", + "src/cpp/src/util/md5.cc", + "src/cpp/src/validating_storage.cc", + "src/cpp/src/validating_util.cc", + "src/cpp/src/validation_task.cc", + ] + + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + + public_configs = [ ":libaddressinput_config" ] + + deps = [ + ":strings", + ":util", + "//base", + "//base:i18n", + "//components/prefs", + "//net", + "//third_party/icu", + "//third_party/re2", + ] +} - test("libaddressinput_unittests") { - sources = - rebase_path(gypi_values.libaddressinput_test_files, ".", "src/cpp") - sources += [ - "chromium/addressinput_util_unittest.cc", - "chromium/chrome_address_validator_unittest.cc", - "chromium/chrome_metadata_source_unittest.cc", - "chromium/chrome_storage_impl_unittest.cc", - "chromium/fallback_data_store_unittest.cc", - "chromium/storage_test_runner.cc", - "chromium/string_compare_unittest.cc", - "chromium/trie_unittest.cc", - ] - - if (is_ios) { - # TODO(rouslan): This tests uses ASSERT_DEATH which is not supported on - # iOS. Re-enable once http://crbug.com/595645 is fixed. - sources -= [ "src/cpp/test/address_data_test.cc" ] - } - - configs -= [ "//build/config/compiler:chromium_code" ] - configs += [ "//build/config/compiler:no_chromium_code" ] - - defines = [ "TEST_DATA_DIR=\"third_party/libaddressinput/src/testdata\"" ] - - include_dirs = [ "src/cpp/src" ] - - deps = [ - ":libaddressinput", - ":strings", - "//base/test:run_all_unittests", - "//components/prefs", - "//net:test_support", - "//testing/gtest", - ] +test("libaddressinput_unittests") { + sources = [ + "chromium/addressinput_util_unittest.cc", + "chromium/chrome_address_validator_unittest.cc", + "chromium/chrome_metadata_source_unittest.cc", + "chromium/chrome_storage_impl_unittest.cc", + "chromium/fallback_data_store_unittest.cc", + "chromium/storage_test_runner.cc", + "chromium/string_compare_unittest.cc", + "chromium/trie_unittest.cc", + "src/cpp/test/address_data_test.cc", + "src/cpp/test/address_field_test.cc", + "src/cpp/test/address_field_util_test.cc", + "src/cpp/test/address_formatter_test.cc", + "src/cpp/test/address_input_helper_test.cc", + "src/cpp/test/address_metadata_test.cc", + "src/cpp/test/address_normalizer_test.cc", + "src/cpp/test/address_problem_test.cc", + "src/cpp/test/address_ui_test.cc", + "src/cpp/test/address_validator_test.cc", + "src/cpp/test/fake_storage.cc", + "src/cpp/test/fake_storage_test.cc", + "src/cpp/test/format_element_test.cc", + "src/cpp/test/language_test.cc", + "src/cpp/test/localization_test.cc", + "src/cpp/test/lookup_key_test.cc", + "src/cpp/test/mock_source.cc", + "src/cpp/test/null_storage_test.cc", + "src/cpp/test/ondemand_supply_task_test.cc", + "src/cpp/test/post_box_matchers_test.cc", + "src/cpp/test/preload_supplier_test.cc", + "src/cpp/test/region_data_builder_test.cc", + "src/cpp/test/region_data_constants_test.cc", + "src/cpp/test/region_data_test.cc", + "src/cpp/test/retriever_test.cc", + "src/cpp/test/rule_retriever_test.cc", + "src/cpp/test/rule_test.cc", + "src/cpp/test/supplier_test.cc", + "src/cpp/test/testdata_source.cc", + "src/cpp/test/testdata_source_test.cc", + "src/cpp/test/util/json_test.cc", + "src/cpp/test/util/md5_unittest.cc", + "src/cpp/test/util/scoped_ptr_unittest.cc", + "src/cpp/test/util/string_compare_test.cc", + "src/cpp/test/util/string_split_unittest.cc", + "src/cpp/test/util/string_util_test.cc", + "src/cpp/test/validating_storage_test.cc", + "src/cpp/test/validating_util_test.cc", + "src/cpp/test/validation_task_test.cc", + ] + + if (is_ios) { + # TODO(rouslan): This tests uses ASSERT_DEATH which is not supported on + # iOS. Re-enable once http://crbug.com/595645 is fixed. + sources -= [ "src/cpp/test/address_data_test.cc" ] } + + configs -= [ "//build/config/compiler:chromium_code" ] + configs += [ "//build/config/compiler:no_chromium_code" ] + + defines = [ "TEST_DATA_DIR=\"src/third_party/libaddressinput/src/testdata\"" ] + + include_dirs = [ "src/cpp/src" ] + + deps = [ + ":libaddressinput", + ":strings", + "//base/test:run_all_unittests", + "//components/prefs", + "//net:test_support", + "//testing/gtest", + ] } diff --git a/chromium/third_party/libaddressinput/chromium/chrome_address_validator.cc b/chromium/third_party/libaddressinput/chromium/chrome_address_validator.cc index ef11a62fb1c..b0bd189d8f0 100644 --- a/chromium/third_party/libaddressinput/chromium/chrome_address_validator.cc +++ b/chromium/third_party/libaddressinput/chromium/chrome_address_validator.cc @@ -9,8 +9,8 @@ #include "base/bind.h" #include "base/location.h" #include "base/logging.h" -#include "base/message_loop/message_loop.h" #include "base/single_thread_task_runner.h" +#include "base/threading/thread_task_runner_handle.h" #include "third_party/libaddressinput/chromium/addressinput_util.h" #include "third_party/libaddressinput/chromium/input_suggester.h" #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_data.h" @@ -112,19 +112,18 @@ AddressValidator::Status AddressValidator::GetSuggestions( return SUCCESS; } -bool AddressValidator::CanonicalizeAdministrativeArea( - AddressData* address) const { +bool AddressValidator::NormalizeAddress(AddressData* address) const { if (!supplier_->IsLoaded(address->region_code)) return false; - // TODO: It would probably be beneficial to use the full canonicalization. - AddressData tmp(*address); - normalizer_->Normalize(&tmp); - address->administrative_area = tmp.administrative_area; - + normalizer_->Normalize(address); return true; } +bool AddressValidator::AreRulesLoadedForRegion(const std::string& region_code) { + return supplier_->IsLoaded(region_code); +} + AddressValidator::AddressValidator() : load_rules_listener_(NULL), weak_factory_(this) {} @@ -148,7 +147,7 @@ void AddressValidator::RulesLoaded(bool success, if (success || attempts_number_[region_code] + 1 >= kMaxAttemptsNumber) return; - base::MessageLoop::current()->task_runner()->PostDelayedTask( + base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( FROM_HERE, base::Bind(&AddressValidator::RetryLoadRules, weak_factory_.GetWeakPtr(), region_code), GetBaseRetryPeriod() * pow(2, attempts_number_[region_code]++)); diff --git a/chromium/third_party/libaddressinput/chromium/chrome_address_validator.h b/chromium/third_party/libaddressinput/chromium/chrome_address_validator.h index de5b39b71ef..43a4a4061cc 100644 --- a/chromium/third_party/libaddressinput/chromium/chrome_address_validator.h +++ b/chromium/third_party/libaddressinput/chromium/chrome_address_validator.h @@ -135,12 +135,15 @@ class AddressValidator { size_t suggestion_limit, std::vector< ::i18n::addressinput::AddressData>* suggestions) const; - // Canonicalizes the administrative area in |address_data|. For example, - // "texas" changes to "TX". Returns true on success, otherwise leaves - // |address_data| alone and returns false. - virtual bool CanonicalizeAdministrativeArea( + // Normalizes the |address_data|. For example, "texas" changes to "TX". + // Returns true on success, otherwise leaves |address_data| alone and returns + // false. + virtual bool NormalizeAddress( ::i18n::addressinput::AddressData* address) const; + // Returns whether the rules associated with the |region_code| are loaded. + virtual bool AreRulesLoadedForRegion(const std::string& region_code); + protected: // Constructor used only for MockAddressValidator. AddressValidator(); diff --git a/chromium/third_party/libaddressinput/chromium/chrome_address_validator_unittest.cc b/chromium/third_party/libaddressinput/chromium/chrome_address_validator_unittest.cc index b37d5f01def..13b5a8b4cc3 100644 --- a/chromium/third_party/libaddressinput/chromium/chrome_address_validator_unittest.cc +++ b/chromium/third_party/libaddressinput/chromium/chrome_address_validator_unittest.cc @@ -620,40 +620,49 @@ TEST_F(AddressValidatorTest, SuggestionsAreCleared) { EXPECT_TRUE(suggestions.empty()); } -TEST_F(AddressValidatorTest, CanonicalizeUsAdminAreaName) { +TEST_F(AddressValidatorTest, NormalizeUsAdminAreaName) { AddressData address; address.region_code = "US"; address.administrative_area = "cALIFORNIa"; - EXPECT_TRUE(validator_->CanonicalizeAdministrativeArea(&address)); + EXPECT_TRUE(validator_->NormalizeAddress(&address)); EXPECT_EQ("CA", address.administrative_area); } -TEST_F(AddressValidatorTest, CanonicalizeUsAdminAreaKey) { +TEST_F(AddressValidatorTest, NormalizeUsAdminAreaKey) { AddressData address; address.region_code = "US"; address.administrative_area = "CA"; - EXPECT_TRUE(validator_->CanonicalizeAdministrativeArea(&address)); + EXPECT_TRUE(validator_->NormalizeAddress(&address)); EXPECT_EQ("CA", address.administrative_area); } -TEST_F(AddressValidatorTest, CanonicalizeJpAdminAreaKey) { +TEST_F(AddressValidatorTest, NormalizeJpAdminAreaKey) { validator_->LoadRules("JP"); AddressData address; address.region_code = "JP"; address.administrative_area = "東京都"; - EXPECT_TRUE(validator_->CanonicalizeAdministrativeArea(&address)); + EXPECT_TRUE(validator_->NormalizeAddress(&address)); EXPECT_EQ("東京都", address.administrative_area); } -TEST_F(AddressValidatorTest, CanonicalizeJpAdminAreaLatinName) { +TEST_F(AddressValidatorTest, NormalizeJpAdminAreaLatinName) { validator_->LoadRules("JP"); AddressData address; address.region_code = "JP"; address.administrative_area = "tOKYo"; - EXPECT_TRUE(validator_->CanonicalizeAdministrativeArea(&address)); + EXPECT_TRUE(validator_->NormalizeAddress(&address)); EXPECT_EQ("TOKYO", address.administrative_area); } +TEST_F(AddressValidatorTest, AreRulesLoadedForRegion_NotLoaded) { + EXPECT_FALSE(validator_->AreRulesLoadedForRegion("JP")); +} + +TEST_F(AddressValidatorTest, AreRulesLoadedForRegion_Loaded) { + validator_->LoadRules("JP"); + EXPECT_TRUE(validator_->AreRulesLoadedForRegion("JP")); +} + TEST_F(AddressValidatorTest, TokushimaSuggestionIsValid) { validator_->LoadRules("JP"); AddressData address; diff --git a/chromium/third_party/libaddressinput/chromium/chrome_metadata_source.cc b/chromium/third_party/libaddressinput/chromium/chrome_metadata_source.cc index c54f129fe18..b875b51da71 100644 --- a/chromium/third_party/libaddressinput/chromium/chrome_metadata_source.cc +++ b/chromium/third_party/libaddressinput/chromium/chrome_metadata_source.cc @@ -40,7 +40,8 @@ class UnownedStringWriter : public net::URLFetcherResponseWriter { return num_bytes; } - virtual int Finish(const net::CompletionCallback& callback) override { + virtual int Finish(int net_error, + const net::CompletionCallback& callback) override { return net::OK; } @@ -59,7 +60,7 @@ ChromeMetadataSource::ChromeMetadataSource( getter_(getter) {} ChromeMetadataSource::~ChromeMetadataSource() { - STLDeleteValues(&requests_); + base::STLDeleteValues(&requests_); } void ChromeMetadataSource::Get(const std::string& key, diff --git a/chromium/third_party/libaddressinput/chromium/json.cc b/chromium/third_party/libaddressinput/chromium/json.cc index 535173f1f62..f7bc4afb725 100644 --- a/chromium/third_party/libaddressinput/chromium/json.cc +++ b/chromium/third_party/libaddressinput/chromium/json.cc @@ -49,7 +49,7 @@ class Json::JsonImpl { : owned_(Parse(json, &parser_error_)), dict_(*owned_) {} - ~JsonImpl() { STLDeleteElements(&sub_dicts_); } + ~JsonImpl() { base::STLDeleteElements(&sub_dicts_); } bool parser_error() const { return parser_error_; } diff --git a/chromium/third_party/libaddressinput/libaddressinput.gyp b/chromium/third_party/libaddressinput/libaddressinput.gyp deleted file mode 100644 index ac769f1832c..00000000000 --- a/chromium/third_party/libaddressinput/libaddressinput.gyp +++ /dev/null @@ -1,155 +0,0 @@ -# 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. -{ - 'includes': ['src/cpp/libaddressinput.gypi'], - 'variables': { - 'libaddressinput_test_data_dir%': 'src/third_party/libaddressinput/src/testdata', - 'libaddressinput_util_files': [ - 'src/cpp/src/address_data.cc', - 'src/cpp/src/address_field.cc', - 'src/cpp/src/address_field_util.cc', - 'src/cpp/src/address_formatter.cc', - 'src/cpp/src/address_metadata.cc', - 'src/cpp/src/address_ui.cc', - 'src/cpp/src/format_element.cc', - 'src/cpp/src/language.cc', - 'src/cpp/src/localization.cc', - 'src/cpp/src/lookup_key.cc', - 'src/cpp/src/region_data_constants.cc', - 'src/cpp/src/rule.cc', - 'src/cpp/src/util/cctype_tolower_equal.cc', - 'src/cpp/src/util/json.cc', - 'src/cpp/src/util/string_split.cc', - 'src/cpp/src/util/string_util.cc', - ], - }, - 'targets': [ - { - 'target_name': 'libaddressinput_strings', - 'type': 'none', - 'variables': { - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/libaddressinput/', - 'grit_grd_file': '../../chrome/app/address_input_strings.grd', - }, - 'actions': [ - { - 'action_name': 'libaddressinput_strings', - 'variables': { - }, - 'includes': [ - '../../build/grit_action.gypi', - ], - }, - ], - 'direct_dependent_settings': { - # Files in libaddressinput include the grit-generated en_messages.cc - # without knowing its path. - 'include_dirs': [ - '<(grit_out_dir)', - ], - }, - }, - { - 'target_name': 'libaddressinput_util', - 'type': 'static_library', - 'sources': [ - '<@(libaddressinput_util_files)', - 'chromium/addressinput_util.cc', - 'chromium/json.cc', - ], - 'sources!': [ - 'src/cpp/src/util/json.cc', - ], - 'include_dirs': [ - 'chromium/override/', - 'src/cpp/include/', - ], - 'defines': [ - 'I18N_ADDRESSINPUT_USE_BASICTYPES_OVERRIDE=1', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - 'chromium/override/', - 'src/cpp/include/', - ], - 'defines': [ - 'I18N_ADDRESSINPUT_USE_BASICTYPES_OVERRIDE=1', - ], - }, - 'dependencies': [ - '../../base/base.gyp:base', - '../re2/re2.gyp:re2', - 'libaddressinput_strings', - ], - 'export_dependent_settings': [ - 'libaddressinput_strings', - ], - }, - { - 'target_name': 'libaddressinput', - 'type': 'static_library', - 'sources': [ - '<@(libaddressinput_files)', - 'chromium/chrome_address_validator.cc', - 'chromium/chrome_metadata_source.cc', - 'chromium/chrome_storage_impl.cc', - 'chromium/fallback_data_store.cc', - 'chromium/input_suggester.cc', - 'chromium/string_compare.cc', - 'chromium/trie.cc', - ], - 'sources!': [ - '<@(libaddressinput_util_files)', - 'src/cpp/src/util/string_compare.cc', - ], - 'direct_dependent_settings': { - 'defines': [ - 'I18N_ADDRESS_VALIDATION_DATA_URL="https://chromium-i18n.appspot.com/ssl-aggregate-address/"', - ], - }, - 'dependencies': [ - '../../base/base.gyp:base', - '../../components/prefs/prefs.gyp:prefs', - '../../net/net.gyp:net', - '../icu/icu.gyp:icui18n', - '../icu/icu.gyp:icuuc', - '../re2/re2.gyp:re2', - 'libaddressinput_util', - ], - 'export_dependent_settings': [ - 'libaddressinput_util', - ], - }, - { - 'target_name': 'libaddressinput_unittests', - 'type': '<(gtest_target_type)', - 'sources': [ - '<@(libaddressinput_test_files)', - 'chromium/addressinput_util_unittest.cc', - 'chromium/chrome_address_validator_unittest.cc', - 'chromium/chrome_metadata_source_unittest.cc', - 'chromium/chrome_storage_impl_unittest.cc', - 'chromium/fallback_data_store_unittest.cc', - 'chromium/storage_test_runner.cc', - 'chromium/string_compare_unittest.cc', - 'chromium/trie_unittest.cc', - ], - 'defines': [ - 'TEST_DATA_DIR="<(libaddressinput_test_data_dir)"', - ], - 'include_dirs': [ - '../../', - 'src/cpp/src/', - ], - 'dependencies': [ - '../../base/base.gyp:run_all_unittests', - '../../components/prefs/prefs.gyp:prefs', - '../../net/net.gyp:net_test_support', - '../../testing/gtest.gyp:gtest', - 'libaddressinput', - 'libaddressinput_util', - ], - }, - ], -} |