Upstream SpanApplier.java and SpanApplierTest.java

ui/android/ui_android.gyp

Index: ui/android/ui_android.gyp
diff --git a/ui/android/ui_android.gyp b/ui/android/ui_android.gyp
index a3bb182455c7c5d66c06aa5eaf4a63fe872a8925..578c205972372a8f09eb835835a2eb7d11970f88 100644
--- a/ui/android/ui_android.gyp
+++ b/ui/android/ui_android.gyp
@@ -59,6 +59,18 @@
       'includes': [ '../../build/java.gypi' ],
     },
     {
+      'target_name': 'ui_javatests',
+      'type': 'none',
+      'variables': {
+        'java_in_dir': '../../ui/android/javatests',
+      },
+      'dependencies': [
+        '../../base/base.gyp:base_java_test_support',
+        'ui_java',
+      ],
+      'includes': [ '../../build/java.gypi' ],
+    },
+    {
       'target_name': 'ui_strings_grd',
        # The android_webview/Android.mk file depends on this target directly.
       'android_unmangled_name': 1,