Add content_shell_test_apk and a several dependencies

content/public/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")
 
 android_aidl("common_aidl") {
   interface_file = "java/src/org/chromium/content/common/common.aidl"
   import_include = "java/src"
   sources = [
     "java/src/org/chromium/content/common/IChildProcessCallback.aidl",
     "java/src/org/chromium/content/common/IChildProcessService.aidl",
   ]
 }
 
 android_resources("content_java_resources") {
   deps = [
     ":content_strings_grd",
     "//ui/android:ui_java_resources",
   ]
   custom_package = "org.chromium.content"
   resource_dirs = [ "java/res" ]
 }
 
 android_library("content_java") {
   deps = [
     ":content_java_resources",
     "//base:base_java",
-    "//media:media_java",
+    "//media/base/android:media_java",
     "//net/android:net_java",
     "//ui/android:ui_java",
     "//third_party/guava:guava_javalib",
     "//third_party/jsr-305:jsr_305_javalib",
 
 #"//content:content_common",
   ]
 
   srcjar_deps = [
     ":common_aidl",
@@ skipping 160 matching lines @@
 }
 
 generate_jar_jni("content_jni_headers") {
   jni_package = "content"
   classes = [
     "android/view/MotionEvent.class",
     "java/util/HashSet.class",
   ]
 }
 
+android_library("content_javatests") {
+  deps = [
+    "//base:base_java",
+    "//base:base_java_test_support",
+    "//content/public/test/android:content_java_test_support",
+    "//content/shell/android:content_shell_java",
+    "//content/shell/android:content_shell_apk_java",
+    "//content/shell/android:content_shell_test_java",
+    "//media/base/android:media_java",
+    "//net/android:net_java",
+    "//net/android:net_java_test_support",
+    "//ui/android:ui_java",
+    ":content_java",
+  ]
+
+  DEPRECATED_java_in_dir = "javatests/src"
+}
+
+
 # TODO(GYP): content_icudata