Revert of Add code to call skia's matchFamilyStyleCharacter API, which uses the

third_party/WebKit/Source/platform/fonts/FontCache.h

 /*
  * Copyright (C) 2006, 2008 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2007-2008 Torch Mobile, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 105 matching lines @@
     // Functions to cache and retrieve the system font metrics.
     static void setMenuFontMetrics(const wchar_t* familyName, int32_t fontHeight);
     static void setSmallCaptionFontMetrics(const wchar_t* familyName, int32_t fontHeight);
     static void setStatusFontMetrics(const wchar_t* familyName, int32_t fontHeight);
     static int32_t menuFontHeight() { return s_menuFontHeight; }
     static const AtomicString& menuFontFamily() { return *s_smallCaptionFontFamilyName; }
     static int32_t smallCaptionFontHeight() { return s_smallCaptionFontHeight; }
     static const AtomicString& smallCaptionFontFamily() { return *s_smallCaptionFontFamilyName; }
     static int32_t statusFontHeight() { return s_statusFontHeight; }
     static const AtomicString& statusFontFamily() { return *s_statusFontFamilyName; }
-    static void setUseSkiaFontFallback(bool useSkiaFontFallback) { s_useSkiaFontFallback = useSkiaFontFallback; }
 #endif
 
     typedef uint32_t FontFileKey;
     PassRefPtr<OpenTypeVerticalData> getVerticalData(const FontFileKey&, const FontPlatformData&);
 
     static void acceptLanguagesChanged(const String&);
 
 #if OS(ANDROID)
     static AtomicString getGenericFamilyNameForScript(const AtomicString& familyName, const FontDescription&);
 #else
@@ skipping 58 matching lines @@
     static float s_deviceScaleFactor;
     static bool s_useSubpixelPositioning;
     static HashMap<String, RefPtr<SkTypeface>>* s_sideloadedFonts;
     // The system font metrics cache.
     static AtomicString* s_menuFontFamilyName;
     static int32_t s_menuFontHeight;
     static AtomicString* s_smallCaptionFontFamilyName;
     static int32_t s_smallCaptionFontHeight;
     static AtomicString* s_statusFontFamilyName;
     static int32_t s_statusFontHeight;
-    static bool s_useSkiaFontFallback;
 #endif
 
     friend class SimpleFontData; // For fontDataFromFontPlatformData
     friend class FontFallbackList;
 };
 
 class PLATFORM_EXPORT FontCachePurgePreventer {
     USING_FAST_MALLOC(FontCachePurgePreventer);
     WTF_MAKE_NONCOPYABLE(FontCachePurgePreventer);
 public:
     FontCachePurgePreventer() { FontCache::fontCache()->disablePurging(); }
     ~FontCachePurgePreventer() { FontCache::fontCache()->enablePurging(); }
 };
 
-CString toSkFontMgrLocale(const String& locale);
-
 } // namespace blink
 
 #endif