GN: Merge apk_deps and deps in test() template

content/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/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build_overrides/v8.gni")
 import("//media/media_options.gni")
@@ skipping 423 matching lines @@
         [ "../browser/accessibility/dump_accessibility_tree_browsertest.cc" ]
   }
 
   if (is_android) {
     sources += rebase_path(
             content_tests_gypi_values.content_browsertests_android_sources,
             ".",
             "//content")
     sources -=
         [ "../browser/battery_status/battery_monitor_impl_browsertest.cc" ]
-    deps -= [ "//device/battery" ]
     deps += [
+      ":content_browsertests_java",
+      ":content_browsertests_manifest",
       "//content/shell:content_shell_lib",
+      "//content/shell/android:content_shell_assets",
       "//content/shell/android:content_shell_jni_headers",
       "//testing/android/native_test:native_test_support",
     ]
-    apk_deps = [
-      ":content_browsertests_java",
-      ":content_browsertests_manifest",
-      "//content/shell/android:content_shell_assets",
-    ]
+    deps -= [ "//device/battery" ]
     android_manifest =
         "${target_gen_dir}/content_browsertests_manifest/AndroidManifest.xml"
     isolate_file = "//content/content_browsertests.isolate"
 
     use_default_launcher = false
   }
 
   if (is_mac) {
     sources += [ "../renderer/external_popup_menu_browsertest.cc" ]
     deps += [
@@ skipping 236 matching lines @@
                     "//content")
     sources -= [
       "../browser/geolocation/network_location_provider_unittest.cc",
       "../browser/geolocation/wifi_data_provider_common_unittest.cc",
       "../browser/power_usage_monitor_impl_unittest.cc",
       "../browser/renderer_host/begin_frame_observer_proxy_unittest.cc",
       "../browser/webui/url_data_manager_backend_unittest.cc",
     ]
     deps -= [ "//device/battery" ]
 
-    apk_deps = [
+    deps += [
       "//base:base_java_unittest_support",
       "//content/public/android:content_java",
       "//v8:v8_external_startup_data_assets",
     ]
 
     defines += [ "APPCACHE_USE_SIMPLE_CACHE" ]
   }
   if (!is_android && !is_ios) {
     deps += [ "//third_party/libvpx_new" ]
   }
@@ skipping 101 matching lines @@
     "//ui/base",
     "//ui/gfx",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
     "//ui/gl",
     "//ui/gl:test_support",
     "//v8",
   ]
 
   if (is_android) {
-    apk_deps = [
+    deps += [
       "//content/public/test/android:content_java_test_support",
       "//content/shell/android:content_shell_assets",
     ]
   } else {
     data_deps = [
       "//third_party/ffmpeg",
       "//third_party/mesa:osmesa",
     ]
   }
 }
@@ skipping 45 matching lines @@
         "//content/common/gpu/media/rendering_helper.cc",
         "//content/common/gpu/media/rendering_helper.h",
         "//content/common/gpu/media/video_decode_accelerator_unittest.cc",
       ]
     }
 
     if (is_android) {
       deps += [
         "//gpu:test_support",
         "//media/base/android",
+        "//media/base/android:media_java",
         "//testing/gmock",
-      ]
-      apk_deps = [
-        "//media/base/android:media_java",
         "//ui/android:ui_java",
       ]
     }
   }
 }