GN: Merge apk_deps and deps in test() template

chrome/test/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/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//chrome/chrome_tests.gni")
@@ skipping 1627 matching lines @@
       "//ui/gl",
       "//v8",
     ]
   }
 
   if (is_android) {
     sources += rebase_path(
             chrome_tests_unit_gypi_values.chrome_unit_tests_offline_pages_sources,
             ".",
             "//chrome")
+    deps += [
+      ":unit_tests_java",
+      "//v8:v8_external_startup_data_assets",
+    ]
     deps -= [ "//third_party/libaddressinput" ]
 
     android_manifest =
         "//chrome/test/android/unit_tests_apk/AndroidManifest.xml"
-    apk_deps = [
-      ":unit_tests_java",
-      "//v8:v8_external_startup_data_assets",
-    ]
     isolate_file = "../unit_tests.isolate"
 
     # Some android targets still depend on --gc-sections to link.
     # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
     ldflags = [ "-Wl,--gc-sections" ]
   } else {
     sources += rebase_path(
             chrome_tests_unit_gypi_values.chrome_unit_tests_non_android_sources,
             ".",
             "//chrome")
@@ skipping 567 matching lines @@
 if (is_android) {
   android_library("unit_tests_java") {
     DEPRECATED_java_in_dir = "//chrome/test/android/unit_tests_apk/src"
     deps = [
       "//base:base_java",
       "//chrome/android:chrome_java",
       "//content/public/android:content_java",
     ]
   }
 }