Upgrade ICU to 54.1

ui/base/l10n/l10n_util_unittest.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 "build/build_config.h"
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <cstdlib>
 #endif
 
@@ skipping 441 matching lines @@
 
   result = l10n_util::GetDisplayNameForLocale("es-419", "en", false);
   EXPECT_EQ(ASCIIToUTF16("Spanish (Latin America)"), result);
 
   result = l10n_util::GetDisplayNameForLocale("-BR", "en", false);
   EXPECT_EQ(ASCIIToUTF16("Brazil"), result);
 
   result = l10n_util::GetDisplayNameForLocale("xyz-xyz", "en", false);
   EXPECT_EQ(ASCIIToUTF16("xyz (XYZ)"), result);
 
+  // Make sure that en-GB locale has the corect display names.
+  result = l10n_util::GetDisplayNameForLocale("en", "en-GB", false);
+  EXPECT_EQ(ASCIIToUTF16("English"), result);
+  result = l10n_util::GetDisplayNameForLocale("es-419", "en-GB", false);
+  EXPECT_EQ(ASCIIToUTF16("Spanish (Latin America)"), result);
+
   // Check for directional markers when using RTL languages to ensure that
   // direction neutral characters such as parentheses are properly formatted.
 
   // Keep a copy of ICU's default locale before we overwrite it.
   const std::string original_locale = base::i18n::GetConfiguredLocale();
 
   base::i18n::SetICUDefaultLocale("he");
   CheckUiDisplayNameForLocale("en-US", "en", false);
   CheckUiDisplayNameForLocale("en-US", "he", true);
 
@@ skipping 85 matching lines @@
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("Latin"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("German"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("pt--BR"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("sl-macedonia"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("@"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en-US@"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en-US@x"));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en-US@x="));
   EXPECT_FALSE(l10n_util::IsValidLocaleSyntax("en-US@=y"));
 }