Disable failing TextEliderTest.* and FontListTest.*

ui/gfx/font_list_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 "ui/gfx/font_list.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
+#if !defined(OS_ANDROID)
 // Helper function for comparing fonts for equality.
 std::string FontToString(const gfx::Font& font) {
   std::string font_string = font.GetFontName();
   font_string += "|";
   font_string += base::IntToString(font.GetFontSize());
   int style = font.GetStyle();
   if (style & gfx::Font::BOLD)
     font_string += "|bold";
   if (style & gfx::Font::ITALIC)
     font_string += "|italic";
   if (style & gfx::Font::UNDERLINE)
     font_string += "|underline";
   return font_string;
 }
+#endif
 
 }  // namespace
 
 namespace gfx {
 
 TEST(FontListTest, ParseDescription) {
   std::vector<std::string> families;
   int style = gfx::Font::NORMAL;
   int size_pixels = 0;
 
@@ skipping 25 matching lines @@
   EXPECT_FALSE(FontList::ParseDescription("Arial,12px,", &families, &style,
                                           &size_pixels));
   EXPECT_FALSE(FontList::ParseDescription("Arial,0px", &families, &style,
                                           &size_pixels));
   EXPECT_FALSE(FontList::ParseDescription("Arial,-1px", &families, &style,
                                           &size_pixels));
   EXPECT_FALSE(FontList::ParseDescription("Arial,foo 12px", &families, &style,
                                           &size_pixels));
 }
 
+TEST(FontListTest, FontDescString_GetStyle) {
+  FontList font_list = FontList("Arial,Sans serif, 8px");
+  EXPECT_EQ(Font::NORMAL, font_list.GetFontStyle());
+
+  font_list = FontList("Arial,Sans serif,Bold 8px");
+  EXPECT_EQ(Font::BOLD, font_list.GetFontStyle());
+
+  font_list = FontList("Arial,Sans serif,Italic 8px");
+  EXPECT_EQ(Font::ITALIC, font_list.GetFontStyle());
+
+  font_list = FontList("Arial,Italic Bold 8px");
+  EXPECT_EQ(Font::BOLD | Font::ITALIC, font_list.GetFontStyle());
+}
+
+// TODO(489354): Enable tests on Android
+#if !defined(OS_ANDROID)

[jbudorick, 2015/05/18 19:17:56]

I think this should be done via the MAYBE_FooTest pattern that the other tests
use. That way at least compiles the tests on Android.

[pkotwicz, 2015/05/18 20:59:05]

Done.

 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();
   ASSERT_EQ(2U, fonts.size());
   EXPECT_EQ("arial|13", FontToString(fonts[0]));
   EXPECT_EQ("Courier New|13", FontToString(fonts[1]));
 }
 
 TEST(FontListTest, Fonts_FromDescStringInFlexibleFormat) {
@@ skipping 45 matching lines @@
   std::vector<Font> input_fonts;
   input_fonts.push_back(font.Derive(0, Font::BOLD));
   input_fonts.push_back(font_1.Derive(-2, Font::BOLD));
   FontList font_list = FontList(input_fonts);
   const std::vector<Font>& fonts = font_list.GetFonts();
   ASSERT_EQ(2U, fonts.size());
   EXPECT_EQ("Arial|8|bold", FontToString(fonts[0]));
   EXPECT_EQ("Courier New|8|bold", FontToString(fonts[1]));
 }
 
-TEST(FontListTest, FontDescString_GetStyle) {
-  FontList font_list = FontList("Arial,Sans serif, 8px");
-  EXPECT_EQ(Font::NORMAL, font_list.GetFontStyle());
-
-  font_list = FontList("Arial,Sans serif,Bold 8px");
-  EXPECT_EQ(Font::BOLD, font_list.GetFontStyle());
-
-  font_list = FontList("Arial,Sans serif,Italic 8px");
-  EXPECT_EQ(Font::ITALIC, font_list.GetFontStyle());
-
-  font_list = FontList("Arial,Italic Bold 8px");
-  EXPECT_EQ(Font::BOLD | Font::ITALIC, font_list.GetFontStyle());
-}
-
 TEST(FontListTest, Fonts_GetStyle) {
   std::vector<Font> fonts;
   fonts.push_back(gfx::Font("Arial", 8));
   fonts.push_back(gfx::Font("Sans serif", 8));
   FontList font_list = FontList(fonts);
   EXPECT_EQ(Font::NORMAL, font_list.GetFontStyle());
   fonts[0] = fonts[0].Derive(0, Font::ITALIC | Font::BOLD);
   fonts[1] = fonts[1].Derive(0, Font::ITALIC | Font::BOLD);
   font_list = FontList(fonts);
   EXPECT_EQ(Font::ITALIC | Font::BOLD, font_list.GetFontStyle());
@@ skipping 73 matching lines @@
   EXPECT_LT(derived_1.GetFontSize(), font_list.GetFontSize());
 
   // A larger upper bound should not change the height of the font list.
   const int height_2 = font_list.GetHeight() + 5;
   FontList derived_2 = font_list.DeriveWithHeightUpperBound(height_2);
   EXPECT_LE(derived_2.GetHeight(), height_2);
   EXPECT_EQ(font_list.GetHeight(), derived_2.GetHeight());
   EXPECT_EQ(font_list.GetFontSize(), derived_2.GetFontSize());
 }
 
+#endif  // !defined(OS_ANDROID)
+
 }  // namespace gfx