Revert 135484 - Use Android API for GetDisplayNameForLocale().

ui/base/l10n/l10n_util_unittest.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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
 
 #include "base/basictypes.h"
@@ skipping 284 matching lines @@
   l10n_util::SortStringsUsingMethod("en-US",
                                     &strings,
                                     &StringWrapper::string);
   ASSERT_TRUE(UTF8ToUTF16("a") == strings[0]->string());
   ASSERT_TRUE(UTF8ToUTF16("b") == strings[1]->string());
   ASSERT_TRUE(UTF8ToUTF16("C") == strings[2]->string());
   ASSERT_TRUE(UTF8ToUTF16("d") == strings[3]->string());
   STLDeleteElements(&strings);
 }
 
-TEST_F(L10nUtilTest, GetDisplayNameForLocale) {
+TEST_F(L10nUtilTest, LocaleDisplayName) {
   // TODO(jungshik): Make this test more extensive.
   // Test zh-CN and zh-TW are treated as zh-Hans and zh-Hant.
   string16 result = l10n_util::GetDisplayNameForLocale("zh-CN", "en", false);
   EXPECT_EQ(ASCIIToUTF16("Chinese (Simplified Han)"), result);
 
   result = l10n_util::GetDisplayNameForLocale("zh-TW", "en", false);
   EXPECT_EQ(ASCIIToUTF16("Chinese (Traditional Han)"), 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);
-
-  result = l10n_util::GetDisplayNameForLocale("xyz-xyz", "en", false);
-  EXPECT_EQ(ASCIIToUTF16("xyz (XYZ)"), result);
-
   // ToUpper and ToLower should work with embedded NULLs.
   const size_t length_with_null = 4;
   char16 buf_with_null[length_with_null] = { 0, 'a', 0, 'b' };
   string16 string16_with_null(buf_with_null, length_with_null);
 
   string16 upper_with_null = base::i18n::ToUpper(string16_with_null);
   ASSERT_EQ(length_with_null, upper_with_null.size());
   EXPECT_TRUE(upper_with_null[0] == 0 && upper_with_null[1] == 'A' &&
               upper_with_null[2] == 0 && upper_with_null[3] == 'B');
 
   string16 lower_with_null = base::i18n::ToLower(upper_with_null);
   ASSERT_EQ(length_with_null, upper_with_null.size());
   EXPECT_TRUE(lower_with_null[0] == 0 && lower_with_null[1] == 'a' &&
               lower_with_null[2] == 0 && lower_with_null[3] == 'b');
 }
 
-TEST_F(L10nUtilTest, GetDisplayNameForCountry) {
-  string16 result = l10n_util::GetDisplayNameForCountry("BR", "en");
-  EXPECT_EQ(ASCIIToUTF16("Brazil"), result);
-
-  result = l10n_util::GetDisplayNameForCountry("419", "en");
-  EXPECT_EQ(ASCIIToUTF16("Latin America"), result);
-
-  result = l10n_util::GetDisplayNameForCountry("xyz", "en");
-  EXPECT_EQ(ASCIIToUTF16("XYZ"), result);
-}
-
 TEST_F(L10nUtilTest, GetParentLocales) {
   std::vector<std::string> locales;
   const std::string top_locale("sr_Cyrl_RS");
   l10n_util::GetParentLocales(top_locale, &locales);
 
   ASSERT_EQ(3U, locales.size());
   EXPECT_EQ("sr_Cyrl_RS", locales[0]);
   EXPECT_EQ("sr_Cyrl", locales[1]);
   EXPECT_EQ("sr", locales[2]);
 }
@@ skipping 45 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"));
 }