summaryrefslogtreecommitdiffstats
path: root/ui/gfx/render_text_unittest.cc
diff options
context:
space:
mode:
authorrockot@google.com <rockot@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-09 00:18:55 +0000
committerrockot@google.com <rockot@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-09 00:18:55 +0000
commit838abbb92ff13ce6868f7852b9d349e6ce7f1121 (patch)
tree88f3d4db86fb1c093c174e1419c921fe8c99998b /ui/gfx/render_text_unittest.cc
parent576b91a7588f9692691bd60f1374b1ce35c8fd0d (diff)
downloadchromium_src-838abbb92ff13ce6868f7852b9d349e6ce7f1121.zip
chromium_src-838abbb92ff13ce6868f7852b9d349e6ce7f1121.tar.gz
chromium_src-838abbb92ff13ce6868f7852b9d349e6ce7f1121.tar.bz2
Disable the following tests:
FontListTest.Fonts_GetHeight_GetBaseline RenderTextTest.SetFontList RenderTextTest.StringSizeRespectsFontListMetrics LabelTest.FontPropertySymbol BUG=316955 Review URL: https://codereview.chromium.org/67523002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234045 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/render_text_unittest.cc')
-rw-r--r--ui/gfx/render_text_unittest.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc
index 4573968..35264c5 100644
--- a/ui/gfx/render_text_unittest.cc
+++ b/ui/gfx/render_text_unittest.cc
@@ -1156,7 +1156,8 @@ TEST_F(RenderTextTest, StringSizeEmptyString) {
}
#endif // !defined(OS_MACOSX)
-TEST_F(RenderTextTest, StringSizeRespectsFontListMetrics) {
+// Disabled. http://crbug.com/316955
+TEST_F(RenderTextTest, DISABLED_StringSizeRespectsFontListMetrics) {
// Check that Arial and Symbol have different font metrics.
Font arial_font("Arial", 16);
Font symbol_font("Symbol", 16);
@@ -1212,7 +1213,8 @@ TEST_F(RenderTextTest, SetFont) {
EXPECT_EQ(12, render_text->GetPrimaryFont().GetFontSize());
}
-TEST_F(RenderTextTest, SetFontList) {
+// Disabled. http://crbug.com/316955
+TEST_F(RenderTextTest, DISABLED_SetFontList) {
scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
render_text->SetFontList(FontList("Arial,Symbol, 13px"));
const std::vector<Font>& fonts = render_text->font_list().GetFonts();