Roll ICU to icu52

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 339 matching lines @@
       EXPECT_EQ(is_rtl, rtl_direction);
     }
   }
 }
 
 TEST_F(L10nUtilTest, GetDisplayNameForLocale) {
   // TODO(jungshik): Make this test more extensive.
   // Test zh-CN and zh-TW are treated as zh-Hans and zh-Hant.
   base::string16 result =
       l10n_util::GetDisplayNameForLocale("zh-CN", "en", false);
-  EXPECT_EQ(ASCIIToUTF16("Chinese (Simplified Han)"), result);
+  EXPECT_EQ(ASCIIToUTF16("Chinese (Simplified)"), result);
 
   result = l10n_util::GetDisplayNameForLocale("zh-TW", "en", false);
-  EXPECT_EQ(ASCIIToUTF16("Chinese (Traditional Han)"), result);
+  EXPECT_EQ(ASCIIToUTF16("Chinese (Traditional)"), result);
+
+  // tl and fil are not identical to be strict, but we treat them as
+  // synonyms.
+  result = l10n_util::GetDisplayNameForLocale("tl", "en", false);
+  EXPECT_EQ(l10n_util::GetDisplayNameForLocale("fil", "en", false), result);
 
   result = l10n_util::GetDisplayNameForLocale("pt-BR", "en", false);
   EXPECT_EQ(ASCIIToUTF16("Portuguese (Brazil)"), result);
 
   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);
 
@@ skipping 98 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"));
 }