| Index: ui/views/controls/styled_label_unittest.cc
|
| diff --git a/ui/views/controls/styled_label_unittest.cc b/ui/views/controls/styled_label_unittest.cc
|
| index 057a3a56a1b654221aff1291db3404b308d4ee0e..a86a1d4f88a55c8d5410c0f71e65af2df6a32374 100644
|
| --- a/ui/views/controls/styled_label_unittest.cc
|
| +++ b/ui/views/controls/styled_label_unittest.cc
|
| @@ -257,7 +257,13 @@ TEST_F(StyledLabelTest, MAYBE_StyledRangeUnderlined) {
|
| static_cast<Label*>(styled()->child_at(1))->font_list().GetFontStyle());
|
| }
|
|
|
| -TEST_F(StyledLabelTest, StyledRangeBold) {
|
| +// Fails on Mac, but only on 10.10. See http://crbug.com/622983.
|
| +#if defined(OS_MACOSX)
|
| +#define MAYBE_StyledRangeBold DISABLED_StyledRangeBold
|
| +#else
|
| +#define MAYBE_StyledRangeBold StyledRangeBold
|
| +#endif
|
| +TEST_F(StyledLabelTest, MAYBE_StyledRangeBold) {
|
| const std::string bold_text(
|
| "This is a block of text whose style will be set to BOLD in the test");
|
| const std::string text(" normal text");
|
|
|