[Android] Stop using skia globals for font overriding in layout tests.

skia/BUILD.gn

Index: skia/BUILD.gn
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 904502a9b0653b04347d2454f873594af4c55bb0..4a7f1aac6477baed4e40e81b323e338d20e38593 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -200,6 +200,7 @@ component("skia") {
     "ext/benchmarking_canvas.cc",
     "ext/convolver.cc",
     "ext/event_tracer_impl.cc",
+    "ext/fontmgr_default_android.cc",
     "ext/fontmgr_default_linux.cc",
     "ext/fontmgr_default_win.cc",
     "ext/google_logging.cc",
@@ -243,7 +244,6 @@ component("skia") {
     "//third_party/skia/src/ports/SkFontHost_win.cpp",
     "//third_party/skia/src/ports/SkFontMgr_FontConfigInterface.cpp",
     "//third_party/skia/src/ports/SkFontMgr_android.cpp",
-    "//third_party/skia/src/ports/SkFontMgr_android_factory.cpp",
     "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp",
     "//third_party/skia/src/ports/SkFontMgr_win_dw.cpp",
     "//third_party/skia/src/ports/SkGlobalInitialization_default.cpp",
@@ -338,13 +338,6 @@ component("skia") {
       "//third_party/skia/src/ports/SkTypeface_win_dw.cpp",
     ]
   }
-  if (!is_android) {
-    sources -= [
-      "//third_party/skia/src/ports/SkFontMgr_android.cpp",
-      "//third_party/skia/src/ports/SkFontMgr_android_factory.cpp",
-      "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp",
-    ]
-  }
   if (!is_mac) {
     sources -= [ "//third_party/skia/src/ports/SkFontHost_mac.cpp" ]
   }
@@ -358,19 +351,15 @@ component("skia") {
     ]
   }
 
-  # Add the files for the SkFontMgr_Android. This is used to emulate android
-  # fonts on linux. See content/zygote/zygote_main_linux.cc
-  if (is_linux) {
-    sources += [
-      "//third_party/skia/src/ports/SkFontMgr_android.cpp",
-      "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp",
-    ]
-  }
-
   if (!is_linux && !is_android) {
     sources -= [
       "//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
       "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
+
+      # Retain the files for the SkFontMgr_Android on linux to emulate android
+      # fonts. See content/zygote/zygote_main_linux.cc
+      "//third_party/skia/src/ports/SkFontMgr_android.cpp",
+      "//third_party/skia/src/ports/SkFontMgr_android_parser.cpp",
     ]
   }