[Fuchsia] Use SkFontMgr_Fuchsia instead of FuchsiaFontManager

Skia now contains SkFontMgr implementation for Fuchsia. Updated
SkFontMgr::Factory() to use it and removed the old implementation from
//skia/ext. The new implementation adds some features that were
previously missing, particularly font collection and character
matching.

Bug: 900395
Change-Id: I545bb33b20d34e3ab02b04f6a1b705e5420d65d7
Reviewed-on: https://chromium-review.googlesource.com/c/1370500
Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Sergey Ulanov <sergeyu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#615626}

skia/BUILD.gn

@@ -485,13 +485,13 @@ component("skia") {
   if (is_fuchsia) {
     sources += [
       "//third_party/skia/src/ports/SkFontMgr_custom.cpp",
+      "//third_party/skia/src/ports/SkFontMgr_fuchsia.cpp",
       "ext/fontmgr_default_fuchsia.cc",
       "ext/fontmgr_default_fuchsia.h",
-      "ext/fontmgr_fuchsia.cc",
-      "ext/fontmgr_fuchsia.h",
     ]
     deps += [
       "//third_party/fuchsia-sdk/sdk:fonts",
+      "//third_party/fuchsia-sdk/sdk:zx",
       "//third_party/icu:icuuc",
     ]
   }

skia/ext/fontmgr_default_fuchsia.cc

@@ -7,7 +7,8 @@
 #include <fuchsia/fonts/cpp/fidl.h>
 
 #include "base/fuchsia/component_context.h"
-#include "skia/ext/fontmgr_fuchsia.h"
+#include "third_party/skia/include/core/SkFontMgr.h"
+#include "third_party/skia/include/ports/SkFontMgr_fuchsia.h"
 
 namespace {
 // This is a purposefully leaky pointer that has ownership of the FontMgr.
@@ -23,7 +24,7 @@ SK_API sk_sp<SkFontMgr> SkFontMgr::Factory() {
   if (g_default_fontmgr) {
     return sk_ref_sp(g_default_fontmgr);
   }
-  return sk_make_sp<skia::FuchsiaFontManager>(
+  return SkFontMgr_New_Fuchsia(
       base::fuchsia::ComponentContext::GetDefault()
           ->ConnectToServiceSync<fuchsia::fonts::Provider>());
 }