Replace deprecated Android java test annotations

content/shell/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("//build_overrides/v8.gni")
 import("//third_party/icu/config.gni")
 
 generate_jni("content_shell_jni_headers") {
@@ skipping 124 matching lines @@
 android_library("content_shell_test_java") {
   testonly = true
   deps = [
     ":content_shell_apk_java",
     ":content_shell_java",
     "//base:base_java",
     "//base:base_java_test_support",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//content/shell/android:content_shell_java",
+    "//third_party/android_support_test_runner:runner_java",
     "//ui/android:ui_java",
   ]
   java_files = [
     "javatests/src/org/chromium/content_shell_apk/ContentShellPreconditionsTest.java",
     "javatests/src/org/chromium/content_shell_apk/ContentShellShellManagementTest.java",
     "javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java",
     "javatests/src/org/chromium/content_shell_apk/ContentShellUrlTest.java",
   ]
 }
 
 instrumentation_test_apk("content_shell_test_apk") {
   deps = [
     "//base:base_javatests",
     "//content/public/android:content_javatests",
     "//net/android:net_javatests",
+    "//third_party/android_support_test_runner:runner_java",
   ]
   apk_under_test = ":content_shell_apk"
   apk_name = "ContentShellTest"
   android_manifest = "javatests/AndroidManifest.xml"
 }
 
 if (current_cpu != "x64") {
   chromium_linker_test_manifest =
       "$target_gen_dir/linker_test_apk/AndroidManifest.xml"
 
@@ skipping 65 matching lines @@
   testonly = true
   deps = [
     ":content_shell_java",
     "//base:base_java",
     "//content/public/android:content_java",
     "//testing/android/native_test:native_test_java",
     "//ui/android:ui_java",
   ]
   java_files = [ "browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java" ]
 }