Rendering text on insecure-site warnings for WebVR

ui/gfx/BUILD.gn

Index: ui/gfx/BUILD.gn
diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn
index 595f3d021985175a377bea39585c8da36d26d8a8..a7952763b9467794303b5d135ef76e7e0bc7e541 100644
--- a/ui/gfx/BUILD.gn
+++ b/ui/gfx/BUILD.gn
@@ -260,7 +260,7 @@ component("gfx") {
   ]
 
   # Text rendering conditions (complicated so separated out).
-  if (use_aura || is_mac) {
+  if (use_aura || is_mac || is_android) {
     # Mac doesn't use RenderTextHarfBuzz by default yet.
     sources += [
       "harfbuzz_font_skia.cc",
@@ -282,7 +282,7 @@ component("gfx") {
     # We don't support RenderText on these platforms.
   }
 
-  if (is_android && use_aura) {
+  if (is_android) {
     sources -= [
       "platform_font_android.cc",
       "text_utils_android.cc",
@@ -306,16 +306,8 @@ component("gfx") {
 
   # Android.
   if (is_android) {
-    if (use_aura) {
-      sources -= [ "canvas_notimplemented.cc" ]
-      sources += [ "font_fallback_android.cc" ]
-    } else {
-      sources -= [
-        "canvas_skia.cc",
-        "path.cc",
-        "selection_model.cc",
-      ]
-    }
+    sources -= [ "canvas_notimplemented.cc" ]
+    sources += [ "font_fallback_android.cc" ]
 
     if (!is_debug) {
       configs -= [ "//build/config/compiler:default_optimization" ]