Fix the failed case L10nUtilTest.GetAppLocale of ui unittests on Android

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 56 matching lines @@
 #endif  // defined(OS_WIN)
 
 #if !defined(OS_MACOSX)
 // We are disabling this test on MacOS because GetApplicationLocale() as an
 // API isn't something that we'll easily be able to unit test in this manner.
 // The meaning of that API, on the Mac, is "the locale used by Cocoa's main
 // nib file", which clearly can't be stubbed by a test app that doesn't use
 // Cocoa.
 
 void SetDefaultLocaleForTest(const std::string& tag, base::Environment* env) {
-#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
+#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
   env->SetVar("LANGUAGE", tag);
 #else
   base::i18n::SetICUDefaultLocale(tag);
 #endif
 }
 
 TEST_F(L10nUtilTest, GetAppLocale) {
   scoped_ptr<base::Environment> env;
   // Use a temporary locale dir so we don't have to actually build the locale
   // pak files for this test.
   FilePath orig_locale_dir;
+#if defined(OS_ANDROID)
+  // For Android, locale file path uses the directory 'paks' under
+  // base::DIR_ANDROID_APP_DATA. See ResourceBundle::GetLocaleFilePath.

[nilesh, 2012/07/25 17:41:50]

I think we should modify ui/base/ui_base_paths.cc to return the correct
DIR_LOCALES for android. This way we won't have this ifdef android in two
places.

+  PathService::Get(base::DIR_ANDROID_APP_DATA, &orig_locale_dir);
+#else
   PathService::Get(ui::DIR_LOCALES, &orig_locale_dir);
+#endif
   FilePath new_locale_dir;
   EXPECT_TRUE(file_util::CreateNewTempDirectory(
       FILE_PATH_LITERAL("l10n_util_test"),
       &new_locale_dir));
+#if defined(OS_ANDROID)
+  PathService::Override(base::DIR_ANDROID_APP_DATA, new_locale_dir);
+  // A variable to hold the real directory for locale files
+  FilePath locale_paks_dir = new_locale_dir.Append(FILE_PATH_LITERAL("paks"));
+  file_util::CreateDirectory(locale_paks_dir);
+#else
   PathService::Override(ui::DIR_LOCALES, new_locale_dir);
+#endif
   // Make fake locale files.
   std::string filenames[] = {
     "en-US",
     "en-GB",
     "fr",
     "es-419",
     "es",
     "zh-TW",
     "zh-CN",
     "he",
     "fil",
     "nb",
     "am",
     "ca",
     "ca@valencia",
   };
 
   for (size_t i = 0; i < arraysize(filenames); ++i) {
+#if defined(OS_ANDROID)
+    FilePath filename = locale_paks_dir.AppendASCII(
+        filenames[i] + ".pak");
+#else
     FilePath filename = new_locale_dir.AppendASCII(
         filenames[i] + ".pak");
+#endif
     file_util::WriteFile(filename, "", 0);
   }
 
   // Keep a copy of ICU's default locale before we overwrite it.
   icu::Locale locale = icu::Locale::getDefault();
 
-#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
+#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
   env.reset(base::Environment::Create());
 
   // Test the support of LANGUAGE environment variable.
   base::i18n::SetICUDefaultLocale("en-US");
   env->SetVar("LANGUAGE", "xx:fr_CA");
   EXPECT_EQ("fr", l10n_util::GetApplicationLocale(""));
 
   env->SetVar("LANGUAGE", "xx:yy:en_gb.utf-8@quot");
   EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale(""));
 
@@ skipping 31 matching lines @@
   EXPECT_EQ("ca", l10n_util::GetApplicationLocale(""));
 
   SetDefaultLocaleForTest("ca@valencia", env.get());
   EXPECT_EQ("ca@valencia", l10n_util::GetApplicationLocale(""));
 
   SetDefaultLocaleForTest("ca_ES@valencia", env.get());
   EXPECT_EQ("ca@valencia", l10n_util::GetApplicationLocale(""));
 
   SetDefaultLocaleForTest("ca_ES.UTF8@valencia", env.get());
   EXPECT_EQ("ca@valencia", l10n_util::GetApplicationLocale(""));
-#endif  // defined(OS_POSIX) && !defined(OS_CHROMEOS)
+#endif  // defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
 
   SetDefaultLocaleForTest("en-US", env.get());
   EXPECT_EQ("en-US", l10n_util::GetApplicationLocale(""));
 
   SetDefaultLocaleForTest("xx", env.get());
   EXPECT_EQ("en-US", l10n_util::GetApplicationLocale(""));
 
-#if defined(OS_CHROMEOS)
-  // ChromeOS honors preferred locale first in GetApplicationLocale(),
-  // defaulting to en-US, while other targets first honor other signals.
+#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
+  // ChromeOS and Android honor preferred locale first in
+  // GetApplicationLocale(), defaulting to en-US, while other
+  // targets first honor other signals.
   base::i18n::SetICUDefaultLocale("en-GB");
   EXPECT_EQ("en-US", l10n_util::GetApplicationLocale(""));
 
   base::i18n::SetICUDefaultLocale("en-US");
   EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale("en-GB"));
 
   base::i18n::SetICUDefaultLocale("en-US");
   EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale("en-AU"));
 
   base::i18n::SetICUDefaultLocale("en-US");
   EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale("en-NZ"));
 
   base::i18n::SetICUDefaultLocale("en-US");
   EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale("en-CA"));
 
   base::i18n::SetICUDefaultLocale("en-US");
   EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale("en-ZA"));
-#else  // defined(OS_CHROMEOS)
+#else  // !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
   SetDefaultLocaleForTest("en-GB", env.get());
   EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale(""));
 
   SetDefaultLocaleForTest("fr-CA", env.get());
   EXPECT_EQ("fr", l10n_util::GetApplicationLocale(""));
 
   SetDefaultLocaleForTest("es-MX", env.get());
   EXPECT_EQ("es-419", l10n_util::GetApplicationLocale(""));
 
   SetDefaultLocaleForTest("es-AR", env.get());
@@ skipping 18 matching lines @@
   EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale(""));
 
   SetDefaultLocaleForTest("en-AU", env.get());
   EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale(""));
 
   SetDefaultLocaleForTest("en-NZ", env.get());
   EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale(""));
 
   SetDefaultLocaleForTest("en-ZA", env.get());
   EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale(""));
-#endif  // defined (OS_CHROMEOS)
+#endif  // defined (OS_CHROMEOS) || defined(OS_ANDROID)
 
 #if defined(OS_WIN)
   // We don't allow user prefs for locale on linux/mac.
   base::i18n::SetICUDefaultLocale("en-US");
   EXPECT_EQ("fr", l10n_util::GetApplicationLocale("fr"));
   EXPECT_EQ("fr", l10n_util::GetApplicationLocale("fr-CA"));
 
   base::i18n::SetICUDefaultLocale("en-US");
   // Aliases iw, no, tl to he, nb, fil.
   EXPECT_EQ("he", l10n_util::GetApplicationLocale("iw"));
@@ skipping 22 matching lines @@
     EXPECT_EQ("en-GB", l10n_util::GetApplicationLocale("am"));
   } else {
     base::i18n::SetICUDefaultLocale("am");
     EXPECT_EQ("am", l10n_util::GetApplicationLocale(""));
     base::i18n::SetICUDefaultLocale("en-GB");
     EXPECT_EQ("am", l10n_util::GetApplicationLocale("am"));
   }
 #endif  // defined(OS_WIN)
 
   // Clean up.
+#if defined(OS_ANDROID)
+  PathService::Override(base::DIR_ANDROID_APP_DATA, orig_locale_dir);
+#else
   PathService::Override(ui::DIR_LOCALES, orig_locale_dir);
+#endif
   file_util::Delete(new_locale_dir, true);
   UErrorCode error_code = U_ZERO_ERROR;
   icu::Locale::setDefault(locale, error_code);
 }
 #endif  // !defined(OS_MACOSX)
 
 TEST_F(L10nUtilTest, SortStringsUsingFunction) {
   std::vector<StringWrapper*> strings;
   strings.push_back(new StringWrapper(UTF8ToUTF16("C")));
   strings.push_back(new StringWrapper(UTF8ToUTF16("d")));
@@ skipping 115 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"));
 }