Index: ui/gfx/render_text_unittest.cc |
diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc |
index 42c299b41b36f0a0022a06491b8eb9508dba45e9..1e885e3d1084363b5955c2f17abbf9bf2d20b3f6 100644 |
--- a/ui/gfx/render_text_unittest.cc |
+++ b/ui/gfx/render_text_unittest.cc |
@@ -14,6 +14,7 @@ |
#include "base/format_macros.h" |
#include "base/i18n/break_iterator.h" |
#include "base/macros.h" |
+#include "base/run_loop.h" |
#include "base/strings/string_split.h" |
#include "base/strings/string_util.h" |
#include "base/strings/stringprintf.h" |
@@ -303,7 +304,13 @@ class RenderTextAllBackends { |
} // namespace |
-using RenderTextTest = testing::Test; |
+class RenderTextTest : public testing::Test { |
+ private: |
+#if defined(OS_WIN) |
+ // Needed to bypass DCHECK in GetFallbackFont |
msw
2016/06/23 20:59:38
nit: trailing period.
Ilya Kulshin
2016/06/24 20:48:25
Done.
|
+ base::MessageLoopForUI message_loop_; |
msw
2016/06/23 20:59:38
q: can you move this to just the needed fixtures?
Ilya Kulshin
2016/06/24 20:48:25
There's about two dozen tests that need this. I'll
|
+#endif |
+}; |
TEST_F(RenderTextTest, DefaultStyles) { |
// Check the default styles applied to new instances and adjusted text. |