Disable failing TextEliderTest.* and FontListTest.*

ui/gfx/text_elider_unittest.cc

Index: ui/gfx/text_elider_unittest.cc
diff --git a/ui/gfx/text_elider_unittest.cc b/ui/gfx/text_elider_unittest.cc
index 641a31f741fbc1cdfe46f450bbaa8c1c7523327a..8122c4277ecf1e7a0389bc054265710481e1374c 100644
--- a/ui/gfx/text_elider_unittest.cc
+++ b/ui/gfx/text_elider_unittest.cc
@@ -839,7 +839,13 @@ TEST(TextEliderTest, ElideRectangleTextCheckConcatWidthEqualsSumOfWidths) {
 }
 #endif // OS_CHROMEOS
 
-TEST(TextEliderTest, ElideRectangleString) {
+// TODO(338784): Enable this on android.
+#if defined(OS_ANDROID)
+#define MAYBE_ElideRectangleString DISABLED_ElideRectangleString
+#else
+#define MAYBE_ElideRectangleString ElideRectangleString
+#endif
+TEST(TextEliderTest, MAYBE_ElideRectangleString) {
   struct TestData {
     const char* input;
     int max_rows;
@@ -922,7 +928,14 @@ TEST(TextEliderTest, ElideRectangleString) {
   }
 }
 
-TEST(TextEliderTest, ElideRectangleStringNotStrict) {
+// TODO(338784): Enable this on android.
+#if defined(OS_ANDROID)
+#define MAYBE_ElideRectangleStringNotStrict \
+    DISABLED_ElideRectangleStringNotStrict
+#else
+#define MAYBE_ElideRectangleStringNotStrict ElideRectangleStringNotStrict
+#endif
+TEST(TextEliderTest, MAYBE_ElideRectangleStringNotStrict) {
   struct TestData {
     const char* input;
     int max_rows;
@@ -1004,7 +1017,13 @@ TEST(TextEliderTest, ElideRectangleStringNotStrict) {
   }
 }
 
-TEST(TextEliderTest, ElideRectangleWide16) {
+// TODO(338784): Enable this on android.
+#if defined(OS_ANDROID)
+#define MAYBE_ElideRectangleWide16 DISABLED_ElideRectangleWide16
+#else
+#define MAYBE_ElideRectangleWide16 ElideRectangleWide16
+#endif
+TEST(TextEliderTest, MAYBE_ElideRectangleWide16) {
   // Two greek words separated by space.
   const base::string16 str(WideToUTF16(
       L"\x03a0\x03b1\x03b3\x03ba\x03cc\x03c3\x03bc\x03b9"
@@ -1023,7 +1042,13 @@ TEST(TextEliderTest, ElideRectangleWide16) {
   EXPECT_EQ(out2, output);
 }
 
-TEST(TextEliderTest, ElideRectangleWide32) {
+// TODO(338784): Enable this on android.
+#if defined(OS_ANDROID)
+#define MAYBE_ElideRectangleWide32 DISABLED_ElideRectangleWide32
+#else
+#define MAYBE_ElideRectangleWide32 ElideRectangleWide32
+#endif
+TEST(TextEliderTest, MAYBE_ElideRectangleWide32) {
   // Four U+1D49C MATHEMATICAL SCRIPT CAPITAL A followed by space "aaaaa".
   const base::string16 str(UTF8ToUTF16(
       "\xF0\x9D\x92\x9C\xF0\x9D\x92\x9C\xF0\x9D\x92\x9C\xF0\x9D\x92\x9C"
@@ -1036,7 +1061,13 @@ TEST(TextEliderTest, ElideRectangleWide32) {
   EXPECT_EQ(out, output);
 }
 
-TEST(TextEliderTest, TruncateString) {
+// TODO(338784): Enable this on android.
+#if defined(OS_ANDROID)
+#define MAYBE_TruncateString DISABLED_TruncateString
+#else
+#define MAYBE_TruncateString TruncateString
+#endif
+TEST(TextEliderTest, MAYBE_TruncateString) {
   base::string16 string = ASCIIToUTF16("foooooey    bxxxar baz");
 
   // Tests that apply to both break behaviors: