diff options
author | Zeno Albisser <zeno.albisser@theqtcompany.com> | 2014-12-05 15:04:29 +0100 |
---|---|---|
committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2014-12-09 10:49:28 +0100 |
commit | af6588f8d723931a298c995fa97259bb7f7deb55 (patch) | |
tree | 060ca707847ba1735f01af2372e0d5e494dc0366 /chromium/content/common/android/address_parser_internal.cc | |
parent | 2fff84d821cc7b1c785f6404e0f8091333283e74 (diff) | |
download | qtwebengine-chromium-af6588f8d723931a298c995fa97259bb7f7deb55.tar.gz |
BASELINE: Update chromium to 40.0.2214.28 and ninja to 1.5.3.
Change-Id: I759465284fd64d59ad120219cbe257f7402c4181
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'chromium/content/common/android/address_parser_internal.cc')
-rw-r--r-- | chromium/content/common/android/address_parser_internal.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/content/common/android/address_parser_internal.cc b/chromium/content/common/android/address_parser_internal.cc index b1a440d3c8b..cc71b241ba4 100644 --- a/chromium/content/common/android/address_parser_internal.cc +++ b/chromium/content/common/android/address_parser_internal.cc @@ -340,7 +340,7 @@ bool FindStateStartingInWord(WordList* words, }; DCHECK_EQ(state_names_accumulative[arraysize(state_names_accumulative) - 1], - static_cast<int>(ARRAYSIZE_UNSAFE(state_names))); + static_cast<int>(arraysize(state_names))); const Word& first_word = words->at(state_first_word); int length = first_word.end - first_word.begin; @@ -590,7 +590,7 @@ bool IsValidLocationName(const Word& word) { DCHECK_EQ( location_names_accumulative[arraysize(location_names_accumulative) - 1], - static_cast<int>(ARRAYSIZE_UNSAFE(location_names))); + static_cast<int>(arraysize(location_names))); if (!IsAsciiAlpha(*word.begin)) return false; |