Enable font-related unit tests on Android

FontListTest::Fonts_GetHeight_GetBaseline is still disabled
because I couldn't find two fonts with different baseline and
different height on Android.

This depends on crrev.com/c/1142484 for non-ARM build.

Bug: 853281, 489354, 642010
Change-Id: Iacf6124794ee53f5f9e30f59bdd958f3883c7ea2
Reviewed-on: https://chromium-review.googlesource.com/1141175
Commit-Queue: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Reviewed-by: Alexei Svitkine <asvitkine@chromium.org>
Cr-Commit-Position: refs/heads/master@{#577359}

ui/gfx/canvas_unittest.cc

@@ -36,12 +36,7 @@ class CanvasTest : public testing::Test {
   FontList font_list_;
 };
 
-#if defined(OS_ANDROID)
-#define MAYBE_StringWidth DISABLED_StringWidth
-#else
-#define MAYBE_StringWidth StringWidth
-#endif
-TEST_F(CanvasTest, MAYBE_StringWidth) {
+TEST_F(CanvasTest, StringWidth) {
   EXPECT_GT(GetStringWidth("Test"), 0);
 }
 
@@ -49,12 +44,7 @@ TEST_F(CanvasTest, StringWidthEmptyString) {
   EXPECT_EQ(0, GetStringWidth(""));
 }
 
-#if defined(OS_ANDROID)
-#define MAYBE_StringSizeEmptyString DISABLED_StringSizeEmptyString
-#else
-#define MAYBE_StringSizeEmptyString StringSizeEmptyString
-#endif
-TEST_F(CanvasTest, MAYBE_StringSizeEmptyString) {
+TEST_F(CanvasTest, StringSizeEmptyString) {
   gfx::Size size = SizeStringInt("", 0, 0);
   EXPECT_EQ(0, size.width());
   EXPECT_GT(size.height(), 0);
@@ -71,13 +61,7 @@ TEST_F(CanvasTest, ClipRectWithScaling) {
   EXPECT_TRUE(clip_rect.Contains(gfx::Rect(100, 0, 20, 2)));
 }
 
-// Line height is only supported on Skia.
-#if defined(OS_ANDROID)
-#define MAYBE_StringSizeWithLineHeight DISABLED_StringSizeWithLineHeight
-#else
-#define MAYBE_StringSizeWithLineHeight StringSizeWithLineHeight
-#endif
-TEST_F(CanvasTest, MAYBE_StringSizeWithLineHeight) {
+TEST_F(CanvasTest, StringSizeWithLineHeight) {
   gfx::Size one_line_size = SizeStringInt("Q", 0, 0);
   gfx::Size four_line_size = SizeStringInt("Q\nQ\nQ\nQ", 1000000, 1000);
   EXPECT_EQ(one_line_size.width(), four_line_size.width());

ui/gfx/font_list_unittest.cc

@@ -98,13 +98,7 @@ TEST(FontListTest, ParseDescription) {
                                           &size_pixels, &weight));
 }
 
-// TODO(489354): Enable this on android.
-#if defined(OS_ANDROID)
-#define MAYBE_Fonts_FromDescString DISABLED_Fonts_FromDescString
-#else
-#define MAYBE_Fonts_FromDescString Fonts_FromDescString
-#endif
-TEST(FontListTest, MAYBE_Fonts_FromDescString) {
+TEST(FontListTest, Fonts_FromDescString) {
   // Test init from font name size string.
   FontList font_list = FontList("arial, Courier New, 13px");
   const std::vector<Font>& fonts = font_list.GetFonts();
@@ -113,15 +107,7 @@ TEST(FontListTest, MAYBE_Fonts_FromDescString) {
   EXPECT_EQ("Courier New|13|normal", FontToString(fonts[1]));
 }
 
-// TODO(489354): Enable this on android.
-#if defined(OS_ANDROID)
-#define MAYBE_Fonts_FromDescStringInFlexibleFormat \
-    DISABLED_Fonts_FromDescStringInFlexibleFormat
-#else
-#define MAYBE_Fonts_FromDescStringInFlexibleFormat \
-    Fonts_FromDescStringInFlexibleFormat
-#endif
-TEST(FontListTest, MAYBE_Fonts_FromDescStringInFlexibleFormat) {
+TEST(FontListTest, Fonts_FromDescStringInFlexibleFormat) {
   // Test init from font name size string with flexible format.
   FontList font_list = FontList("  arial   ,   Courier New ,   13px");
   const std::vector<Font>& fonts = font_list.GetFonts();
@@ -130,15 +116,7 @@ TEST(FontListTest, MAYBE_Fonts_FromDescStringInFlexibleFormat) {
   EXPECT_EQ("Courier New|13|normal", FontToString(fonts[1]));
 }
 
-// TODO(489354): Enable this on android.
-#if defined(OS_ANDROID)
-#define MAYBE_Fonts_FromDescStringWithStyleInFlexibleFormat \
-    DISABLED_Fonts_FromDescStringWithStyleInFlexibleFormat
-#else
-#define MAYBE_Fonts_FromDescStringWithStyleInFlexibleFormat \
-    Fonts_FromDescStringWithStyleInFlexibleFormat
-#endif
-TEST(FontListTest, MAYBE_Fonts_FromDescStringWithStyleInFlexibleFormat) {
+TEST(FontListTest, Fonts_FromDescStringWithStyleInFlexibleFormat) {
   // Test init from font name style size string with flexible format.
   FontList font_list = FontList(
       "  arial  ,  Courier New ,  Bold   "
@@ -149,13 +127,7 @@ TEST(FontListTest, MAYBE_Fonts_FromDescStringWithStyleInFlexibleFormat) {
   EXPECT_EQ("Courier New|13|italic|bold", FontToString(fonts[1]));
 }
 
-// TODO(489354): Enable this on android.
-#if defined(OS_ANDROID)
-#define MAYBE_Fonts_FromFont DISABLED_Fonts_FromFont
-#else
-#define MAYBE_Fonts_FromFont Fonts_FromFont
-#endif
-TEST(FontListTest, MAYBE_Fonts_FromFont) {
+TEST(FontListTest, Fonts_FromFont) {
   // Test init from Font.
   Font font("Arial", 8);
   FontList font_list = FontList(font);
@@ -164,14 +136,7 @@ TEST(FontListTest, MAYBE_Fonts_FromFont) {
   EXPECT_EQ("Arial|8|normal", FontToString(fonts[0]));
 }
 
-// TODO(489354): Enable this on android.
-#if defined(OS_ANDROID)
-#define MAYBE_Fonts_FromFontWithNonNormalStyle \
-    DISABLED_Fonts_FromFontWithNonNormalStyle
-#else
-#define MAYBE_Fonts_FromFontWithNonNormalStyle Fonts_FromFontWithNonNormalStyle
-#endif
-TEST(FontListTest, MAYBE_Fonts_FromFontWithNonNormalStyle) {
+TEST(FontListTest, Fonts_FromFontWithNonNormalStyle) {
   // Test init from Font with non-normal style.
   Font font("Arial", 8);
   FontList font_list(font.Derive(2, Font::NORMAL, Font::Weight::BOLD));
@@ -185,13 +150,7 @@ TEST(FontListTest, MAYBE_Fonts_FromFontWithNonNormalStyle) {
   EXPECT_EQ("Arial|6|italic|normal", FontToString(fonts[0]));
 }
 
-// TODO(489354): Enable this on android.
-#if defined(OS_ANDROID)
-#define MAYBE_Fonts_FromFontVector DISABLED_Fonts_FromFontVector
-#else
-#define MAYBE_Fonts_FromFontVector Fonts_FromFontVector
-#endif
-TEST(FontListTest, MAYBE_Fonts_FromFontVector) {
+TEST(FontListTest, Fonts_FromFontVector) {
   // Test init from Font vector.
   Font font("Arial", 8);
   Font font_1("Courier New", 10);
@@ -223,13 +182,7 @@ TEST(FontListTest, FontDescString_GetStyle) {
   EXPECT_EQ(Font::Weight::BOLD, font_list.GetFontWeight());
 }
 
-// TODO(489354): Enable this on android.
-#if defined(OS_ANDROID)
-#define MAYBE_Fonts_GetStyle DISABLED_Fonts_GetStyle
-#else
-#define MAYBE_Fonts_GetStyle Fonts_GetStyle
-#endif
-TEST(FontListTest, MAYBE_Fonts_GetStyle) {
+TEST(FontListTest, Fonts_GetStyle) {
   std::vector<Font> fonts;
   fonts.push_back(Font("Arial", 8));
   fonts.push_back(Font("Sans serif", 8));
@@ -242,13 +195,7 @@ TEST(FontListTest, MAYBE_Fonts_GetStyle) {
   EXPECT_EQ(Font::Weight::BOLD, font_list.GetFontWeight());
 }
 
-// TODO(489354): Enable this on android.
-#if defined(OS_ANDROID)
-#define MAYBE_Fonts_Derive DISABLED_Fonts_Derive
-#else
-#define MAYBE_Fonts_Derive Fonts_Derive
-#endif
-TEST(FontListTest, MAYBE_Fonts_Derive) {
+TEST(FontListTest, Fonts_Derive) {
   std::vector<Font> fonts;
   fonts.push_back(Font("Arial", 8));
   fonts.push_back(Font("Courier New", 8));
@@ -269,13 +216,7 @@ TEST(FontListTest, MAYBE_Fonts_Derive) {
   EXPECT_EQ("Courier New|13|underline|bold", FontToString(underline_fonts[1]));
 }
 
-// TODO(489354): Enable this on android.
-#if defined(OS_ANDROID)
-#define MAYBE_Fonts_DeriveWithSizeDelta DISABLED_Fonts_DeriveWithSizeDelta
-#else
-#define MAYBE_Fonts_DeriveWithSizeDelta Fonts_DeriveWithSizeDelta
-#endif
-TEST(FontListTest, MAYBE_Fonts_DeriveWithSizeDelta) {
+TEST(FontListTest, Fonts_DeriveWithSizeDelta) {
   std::vector<Font> fonts;
   fonts.push_back(
       Font("Arial", 18).Derive(0, Font::ITALIC, Font::Weight::NORMAL));
@@ -291,7 +232,7 @@ TEST(FontListTest, MAYBE_Fonts_DeriveWithSizeDelta) {
   EXPECT_EQ("Courier New|13|italic|normal", FontToString(derived_fonts[1]));
 }
 
-// TODO(489354): Enable this on android.
+// TODO(865540): Enable this on android.
 #if defined(OS_ANDROID)
 #define MAYBE_Fonts_GetHeight_GetBaseline DISABLED_Fonts_GetHeight_GetBaseline
 #else
@@ -327,14 +268,7 @@ TEST(FontListTest, MAYBE_Fonts_GetHeight_GetBaseline) {
             font_list_mix.GetHeight() - font_list_mix.GetBaseline());
 }
 
-// TODO(489354): Enable this on android.
-#if defined(OS_ANDROID)
-#define MAYBE_Fonts_DeriveWithHeightUpperBound \
-    DISABLED_Fonts_DeriveWithHeightUpperBound
-#else
-#define MAYBE_Fonts_DeriveWithHeightUpperBound Fonts_DeriveWithHeightUpperBound
-#endif
-TEST(FontListTest, MAYBE_Fonts_DeriveWithHeightUpperBound) {
+TEST(FontListTest, Fonts_DeriveWithHeightUpperBound) {
   std::vector<Font> fonts;
 
   fonts.push_back(Font("Arial", 18));

ui/gfx/font_names_testing.cc

@@ -8,20 +8,40 @@
 
 namespace gfx {
 
+/*
+Reference for fonts available on Android:
+
+Jelly Bean:
+  https://android.googlesource.com/platform/frameworks/base/+/jb-release/data/fonts/system_fonts.xml
+KitKat:
+  https://android.googlesource.com/platform/frameworks/base/+/kitkat-release/data/fonts/system_fonts.xml
+master:
+  https://android.googlesource.com/platform/frameworks/base/+/master/data/fonts/fonts.xml
+
+Note that we have to support the full range from JellyBean to the latest
+dessert.
+*/
+
 #if defined(OS_LINUX)
 const char kTestFontName[] = "Arimo";
+#elif defined(OS_ANDROID)
+const char kTestFontName[] = "sans-serif";
 #else
 const char kTestFontName[] = "Arial";
 #endif
 
 #if defined(OS_LINUX)
 const char kSymbolFontName[] = "DejaVu Sans";
+#elif defined(OS_ANDROID)
+const char kSymbolFontName[] = "monospace";
 #else
 const char kSymbolFontName[] = "Symbol";
 #endif
 
 #if defined(OS_LINUX)
 const char kCJKFontName[] = "Noto Sans CJK JP";
+#elif defined(OS_ANDROID)
+const char kCJKFontName[] = "serif";
 #elif defined(OS_MACOSX)
 const char kCJKFontName[] = "Heiti SC";
 #else

ui/gfx/font_unittest.cc

@@ -48,12 +48,7 @@ class ScopedMinimumFontSizeCallback {
 int ScopedMinimumFontSizeCallback::minimum_size_ = 0;
 #endif  // defined(OS_WIN)
 
-#if defined(OS_ANDROID)
-#define MAYBE_LoadArial DISABLED_LoadArial
-#else
-#define MAYBE_LoadArial LoadArial
-#endif
-TEST_F(FontTest, MAYBE_LoadArial) {
+TEST_F(FontTest, LoadArial) {
   Font cf(kTestFontName, 16);
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_IOS)
   EXPECT_TRUE(cf.GetNativeFont());
@@ -65,12 +60,7 @@ TEST_F(FontTest, MAYBE_LoadArial) {
             base::ToLowerASCII(cf.GetActualFontNameForTesting()));
 }
 
-#if defined(OS_ANDROID)
-#define MAYBE_LoadArialBold DISABLED_LoadArialBold
-#else
-#define MAYBE_LoadArialBold LoadArialBold
-#endif
-TEST_F(FontTest, MAYBE_LoadArialBold) {
+TEST_F(FontTest, LoadArialBold) {
   Font cf(kTestFontName, 16);
   Font bold(cf.Derive(0, Font::NORMAL, Font::Weight::BOLD));
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_IOS)
@@ -82,47 +72,27 @@ TEST_F(FontTest, MAYBE_LoadArialBold) {
             base::ToLowerASCII(cf.GetActualFontNameForTesting()));
 }
 
-#if defined(OS_ANDROID)
-#define MAYBE_Ascent DISABLED_Ascent
-#else
-#define MAYBE_Ascent Ascent
-#endif
-TEST_F(FontTest, MAYBE_Ascent) {
+TEST_F(FontTest, Ascent) {
   Font cf(kTestFontName, 16);
   EXPECT_GT(cf.GetBaseline(), 2);
   EXPECT_LE(cf.GetBaseline(), 22);
 }
 
-#if defined(OS_ANDROID)
-#define MAYBE_Height DISABLED_Height
-#else
-#define MAYBE_Height Height
-#endif
-TEST_F(FontTest, MAYBE_Height) {
+TEST_F(FontTest, Height) {
   Font cf(kTestFontName, 16);
   EXPECT_GE(cf.GetHeight(), 16);
   // TODO(akalin): Figure out why height is so large on Linux.
   EXPECT_LE(cf.GetHeight(), 26);
 }
 
-#if defined(OS_ANDROID)
-#define MAYBE_CapHeight DISABLED_CapHeight
-#else
-#define MAYBE_CapHeight CapHeight
-#endif
-TEST_F(FontTest, MAYBE_CapHeight) {
+TEST_F(FontTest, CapHeight) {
   Font cf(kTestFontName, 16);
   EXPECT_GT(cf.GetCapHeight(), 0);
   EXPECT_GT(cf.GetCapHeight(), cf.GetHeight() / 2);
   EXPECT_LT(cf.GetCapHeight(), cf.GetBaseline());
 }
 
-#if defined(OS_ANDROID)
-#define MAYBE_AvgWidths DISABLED_AvgWidths
-#else
-#define MAYBE_AvgWidths AvgWidths
-#endif
-TEST_F(FontTest, MAYBE_AvgWidths) {
+TEST_F(FontTest, AvgWidths) {
   Font cf(kTestFontName, 16);
   EXPECT_EQ(cf.GetExpectedTextWidth(0), 0);
   EXPECT_GT(cf.GetExpectedTextWidth(1), cf.GetExpectedTextWidth(0));
@@ -130,7 +100,7 @@ TEST_F(FontTest, MAYBE_AvgWidths) {
   EXPECT_GT(cf.GetExpectedTextWidth(3), cf.GetExpectedTextWidth(2));
 }
 
-#if defined(OS_WIN) || defined(OS_ANDROID)
+#if defined(OS_WIN)
 #define MAYBE_GetActualFontNameForTesting DISABLED_GetActualFontNameForTesting
 #else
 #define MAYBE_GetActualFontNameForTesting GetActualFontNameForTesting
@@ -165,13 +135,7 @@ TEST_F(FontTest, MAYBE_GetActualFontNameForTesting) {
             base::ToLowerASCII(fallback_font.GetActualFontNameForTesting()));
 }
 
-#if defined(OS_ANDROID)
-// https://crbug.com/642010
-#define MAYBE_DeriveFont DISABLED_DeriveFont
-#else
-#define MAYBE_DeriveFont DeriveFont
-#endif
-TEST_F(FontTest, MAYBE_DeriveFont) {
+TEST_F(FontTest, DeriveFont) {
   Font cf(kTestFontName, 8);
   const int kSizeDelta = 2;
   Font cf_underlined =

ui/gfx/text_utils_unittest.cc

@@ -65,7 +65,7 @@ TEST(TextUtilsTest, RemoveAcceleratorChar) {
 }
 
 // Disabled on Ozone since there are no fonts: crbug.com/320050
-#if defined(USE_OZONE) || defined(OS_ANDROID)
+#if defined(USE_OZONE)
 #define MAYBE_GetStringWidth DISABLED_GetStringWidth
 #else
 #define MAYBE_GetStringWidth GetStringWidth