Use Skia for font selection on windows

Source/core/core.gyp

Index: Source/core/core.gyp
diff --git a/Source/core/core.gyp b/Source/core/core.gyp
index 106900d4266a42d2aea911bcfd0cee7c2f71ab2c..3ec89a68976373891969bee1a9d19af0ba71adce 100644
--- a/Source/core/core.gyp
+++ b/Source/core/core.gyp
@@ -761,8 +761,6 @@
             ['include', 'platform/graphics/opentype/'],
             ['include', 'platform/graphics/skia/SkiaFontWin\\.(cpp|h)$'],
 
-            ['exclude', 'platform/graphics/skia/FontCacheSkia\\.cpp$'],
-
             # Windows currently uses FontCustomPlatformDataWin.cpp instead.
             ['exclude', 'platform/graphics/skia/FontCustomPlatformDataSkia\\.cpp$'],
             ['include', 'platform/graphics/win/FontCustomPlatformDataWin\\.cpp$'],
@@ -780,13 +778,17 @@
               'sources/': [
                 ['exclude', 'platform/graphics/skia/SimpleFontDataSkia\\.cpp$'],
                 ['exclude', 'platform/graphics/skia/GlyphPageTreeNodeSkia\\.cpp$'],
+                ['exclude', 'platform/graphics/skia/FontCacheSkia\\.cpp$'],
+                ['exclude', 'platform/graphics/skia/FontCacheSkiaWin\\.cpp$'],
               ],
             },{ # ENABLE_GDI_FONTS_ON_WINDOWS!=1
               'sources/': [
-                ['exclude', 'platform/graphics/chromium/SimpleFontDataChromiumWin\\.cpp$'],
                 ['include', 'platform/graphics/skia/SimpleFontDataSkia\\.cpp$'],
                 ['include', 'platform/graphics/skia/GlyphPageTreeNodeSkia\\.cpp$'],
+                ['include', 'platform/graphics/skia/FontCacheSkiaWin\\.cpp$'],
+                ['exclude', 'platform/graphics/chromium/SimpleFontDataChromiumWin\\.cpp$'],
                 ['exclude', 'platform/graphics/chromium/GlyphPageTreeNodeChromiumWin\\.cpp$'],
+                ['exclude', 'platform/graphics/chromium/FontCacheChromiumWin\\.cpp$'],
               ],
             }],
           ],