remove SK_SUPPORT_NEW_ONCREATESCALERCONTEXT guard

content/child/font_warmup_win_unittest.cc

 // Copyright 2015 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 "content/child/font_warmup_win.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 19 matching lines @@
                  const char* familyName,
                  SkFontTableTag tag,
                  const char* data,
                  size_t dataLength)
       : SkTypeface(style, 0),
         familyName_(familyName),
         tag_(tag),
         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;
   }
   void onFilterRec(SkScalerContextRec*) const override { ADD_FAILURE(); }
   SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
       PerGlyphInfo,
       const uint32_t* glyphIDs,
       uint32_t glyphIDsCount) const override {
     ADD_FAILURE();
     return nullptr;
@@ skipping 375 matching lines @@
   DWORD data_size = static_cast<DWORD>(strlen(kTestFontData));
   std::vector<char> data(data_size);
   DWORD size = GetFontData(hdc, kTestFontTableTag, 0, &data[0], data.size());
   EXPECT_EQ(size, data_size);
   EXPECT_EQ(memcmp(&data[0], kTestFontData, data.size()), 0);
   EXPECT_TRUE(DeleteObject(font));
   EXPECT_TRUE(DeleteDC(hdc));
 }
 
 }  // namespace content