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

skia/ext/fontmgr_default_android.cc

Index: skia/ext/fontmgr_default_android.cc
diff --git a/skia/ext/fontmgr_default_android.cc b/skia/ext/fontmgr_default_android.cc
new file mode 100644
index 0000000000000000000000000000000000000000..cfde08db75874b1a2c28df26d563ab4ac9fb89a4
--- /dev/null
+++ b/skia/ext/fontmgr_default_android.cc
@@ -0,0 +1,20 @@
+// Copyright 2016 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 "skia/ext/fontmgr_default_android.h"
+
+#include "third_party/skia/include/ports/SkFontMgr.h"
+#include "third_party/skia/include/ports/SkFontMgr_android.h"
+
+namespace {
+SkFontMgr* g_default_fontmgr;
+}  // namespace
+
+SK_API void SetDefaultSkiaFactory(SkFontMgr* fontmgr) {
+  g_default_fontmgr = fontmgr;
+}
+
+SK_API SkFontMgr* SkFontMgr::Factory() {
+  return g_default_fontmgr ? g_default_fontmgr : SkFontMgr_New_Android(nullptr);

[bungeman-chromium, 2016/12/25 17:53:57]

See fontmgr_default_linux.cc, you'll need to SkRef the g_default_fontmgr. I'll
get these updated to sk_sp smart pointers soon. (This factory is supposed to
return a ref, so it should be returning sk_sp <SkFontMgr> to enforce this.

[jbudorick, 2016/12/27 17:11:33]

Done.

+}