Upgrade ICU to 54.1

ui/base/l10n/l10n_util.cc

 // Copyright (c) 2012 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.
 
 #include "ui/base/l10n/l10n_util.h"
 
 #include <algorithm>
 #include <cstdlib>
 #include <iterator>
 #include <string>
@@ skipping 173 matching lines @@
   "zh-CN",  // Chinese (Simplified)
   "zh-TW",  // Chinese (Traditional)
   "zu",     // Zulu
 };
 
 // Returns true if |locale_name| has an alias in the ICU data file.
 bool IsDuplicateName(const std::string& locale_name) {
   static const char* const kDuplicateNames[] = {
     "en",
     "en_001",
-    "pt",
+    "pt", // pt-BR and pt-PT are used.
     "zh",
     "zh_hans_cn",
     "zh_hant_hk",
     "zh_hant_mo",
     "zh_hans_sg",
     "zh_hant_tw"
   };
 
-  // Skip all 'es_RR'. Currently, we use 'es' for es-ES (Spanish in Spain).
-  // 'es-419' (Spanish in Latin America) is not available in ICU so that it
-  // has to be added manually in GetAvailableLocales().
-  if (LowerCaseEqualsASCII(locale_name.substr(0, 3),  "es_"))
-    return true;
+  // Skip all the es_Foo other than es_419 for now.
+  if (StartsWithASCII(locale_name, "es_", false))
+    return !EndsWith(locale_name, "419", true);
+
   for (size_t i = 0; i < arraysize(kDuplicateNames); ++i) {
     if (base::strcasecmp(kDuplicateNames[i], locale_name.c_str()) == 0)
       return true;
   }
   return false;
 }
 
 // We added 30+ minimally populated locales with only a few entries
 // (exemplar character set, script, writing direction and its own
 // lanaguage name). These locales have to be distinguished from the
@@ skipping 72 matching lines @@
 
       // Map the Chinese locale names over to zh-CN and zh-TW.
       if (LowerCaseEqualsASCII(locale_name, "zh-hans")) {
         locale_name = "zh-CN";
       } else if (LowerCaseEqualsASCII(locale_name, "zh-hant")) {
         locale_name = "zh-TW";
       }
       locales->push_back(locale_name);
     }
 
-    // Manually add 'es-419' to the list. See the comment in IsDuplicateName().
-    locales->push_back("es-419");
     return locales;
   }
 };
 
 base::LazyInstance<std::vector<std::string>, AvailableLocalesTraits>
     g_available_locales = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 namespace l10n_util {
@@ skipping 563 matching lines @@
 
 const char* const* GetAcceptLanguageListForTesting() {
   return kAcceptLanguageList;
 }
 
 size_t GetAcceptLanguageListSizeForTesting() {
   return arraysize(kAcceptLanguageList);
 }
 
 }  // namespace l10n_util