| Index: content/child/font_warmup_win_unittest.cc
|
| diff --git a/content/child/font_warmup_win_unittest.cc b/content/child/font_warmup_win_unittest.cc
|
| index a5348ed4e4008f28e70e0e8311f367700b633a2f..fc860177f8476e9a82f34401c9ccd927b7514987 100644
|
| --- a/content/child/font_warmup_win_unittest.cc
|
| +++ b/content/child/font_warmup_win_unittest.cc
|
| @@ -37,12 +37,8 @@ class TestSkTypeface : public SkTypeface {
|
| data_(data, data + dataLength) {}
|
|
|
| protected:
|
| -#ifdef SK_SUPPORT_NEW_ONCREATESCALERCONTEXT
|
| SkScalerContext* onCreateScalerContext(const SkScalerContextEffects&,
|
| const SkDescriptor*) const override {
|
| -#else
|
| - SkScalerContext* onCreateScalerContext(const SkDescriptor*) const override {
|
| -#endif
|
| ADD_FAILURE();
|
| return nullptr;
|
| }
|
|
|