Index: ui/gfx/font_unittest.cc |
diff --git a/ui/gfx/font_unittest.cc b/ui/gfx/font_unittest.cc |
index e123d96794ea7021bf27332d8dca9d15dc436969..c74aae18f143dd6f644adb2f928bad3ebc831a26 100644 |
--- a/ui/gfx/font_unittest.cc |
+++ b/ui/gfx/font_unittest.cc |
@@ -162,7 +162,13 @@ TEST_F(FontTest, MAYBE_GetActualFontNameForTesting) { |
base::ToLowerASCII(fallback_font.GetActualFontNameForTesting())); |
} |
-TEST_F(FontTest, DeriveFont) { |
+#if defined(OS_ANDROID) |
+// https://crbug.com/642010 |
+#define MAYBE_DeriveFont DISABLED_DeriveFont |
+#else |
+#define MAYBE_DeriveFont DeriveFont |
+#endif |
+TEST_F(FontTest, MAYBE_DeriveFont) { |
Font cf("Arial", 8); |
const int kSizeDelta = 2; |
Font cf_underlined = |