Upstream SpanApplier.java and SpanApplierTest.java

chrome/android/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//chrome/version.gni")
 import("//third_party/icu/config.gni")
 import("channel.gni")
 
@@ skipping 406 matching lines @@
   DEPRECATED_java_in_dir = "shell/javatests/src"
 }
 
 # GYP: //chrome/chrome_tests.gypi:chrome_shell_test_apk
 android_apk("chrome_shell_test_apk") {
   testonly = true
   deps = [
     ":chrome_javatests",
     ":chrome_shell_test_java",
     "//sync/android:sync_javatests",
+    "//ui/android:ui_javatests",
   ]
   apk_name = "ChromeShellTest"
   android_manifest = "shell/javatests/AndroidManifest.xml"
 }
 
 # GYP: //chrome/chrome_tests.gypi:chrome_sync_shell_test_apk
 android_apk("chrome_sync_shell_test_apk") {
   testonly = true
   deps = [
     ":chrome_java",
@@ skipping 39 matching lines @@
   source = "java/ChromeVersionConstants.java.version"
   output = chrome_version_java_file
   extra_args = ["-e", "CHANNEL=str.upper('$android_channel')"]
 }
 
 zip("chrome_version_srcjar") {
   inputs = [ chrome_version_java_file ]
   output = "$target_gen_dir/$target_name.srcjar"
   base_dir = chrome_version_java_dir
 }