summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authormukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-07 18:58:33 +0000
committermukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-07 18:58:33 +0000
commit1a94d6f3d2fe07161ba1c15b2785d97794d59dce (patch)
treea3b57ee7d3f4c14ac43998dc44d738ad96464387 /ui
parent0cb6d6ff0cf7b11904d8a9a1e76fce5ed9fbf485 (diff)
downloadchromium_src-1a94d6f3d2fe07161ba1c15b2785d97794d59dce.zip
chromium_src-1a94d6f3d2fe07161ba1c15b2785d97794d59dce.tar.gz
chromium_src-1a94d6f3d2fe07161ba1c15b2785d97794d59dce.tar.bz2
Allows TimeFormat.DecimalPointNotDot only on Mac
Seems failing on linux too... BUG=268688 TBR=miu@chromium.org Review URL: https://codereview.chromium.org/22460006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216242 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/base/l10n/time_format_unittest.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/base/l10n/time_format_unittest.cc b/ui/base/l10n/time_format_unittest.cc
index 21af5d6..ac1217a 100644
--- a/ui/base/l10n/time_format_unittest.cc
+++ b/ui/base/l10n/time_format_unittest.cc
@@ -75,13 +75,13 @@ TEST(TimeFormat, RelativeDate) {
// ScopedLocale is unavailable if not OS_POSIX.
#if defined(OS_POSIX)
-#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
-// DecimalPointNotDot fails on ChromeOS because the fr_FR locale isn't
-// available. See crrev.com/91117
-#define MAYBE_DecimalPointNotDot DISABLED_DecimalPointNotDot
-#else
+#if defined(OS_MACOSX)
+// DecimalPointNotDot succeeds only on Mac OSX because of the locale load.
+// See crrev.com/91117
#define MAYBE_DecimalPointNotDot DecimalPointNotDot
-#endif // OS_CHROMEOS
+#else
+#define MAYBE_DecimalPointNotDot DISABLED_DecimalPointNotDot
+#endif // OS_MACOSX
TEST(TimeFormat, MAYBE_DecimalPointNotDot) {
base::ScopedLocale scoped_locale("fr_FR.utf-8");