GN: Merge apk_deps and deps in test() template

components/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/features.gni")
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 import("//tools/grit/repack.gni")
 
 if (is_android) {
@@ skipping 472 matching lines @@
       "//third_party/mesa:osmesa",
       "//ui/resources:ui_test_pak",
     ]
   }  # iOS/!iOS
 
   if (is_android) {
     isolate_file = "components_unittests.isolate"
 
     deps += [
       "//components/invalidation/impl",
+      "//components/invalidation/impl:java",
       "//components/safe_json",
+      "//components/safe_json/android:safe_json_java",
       "//components/signin/core/browser",
+      "//components/signin/core/browser/android:java",
+      "//components/variations/android:variations_java",
+      "//content/public/android:content_java",
       "//content/public/android:content_java",
       "//content/public/browser",
       "//net",
+      "//ui/android:ui_java",
       "//ui/base",
       "//ui/gfx",
     ]
 
-    apk_deps = [
-      "//components/invalidation/impl:java",
-      "//components/safe_json/android:safe_json_java",
-      "//components/signin/core/browser/android:java",
-      "//components/variations/android:variations_java",
-      "//content/public/android:content_java",
-      "//ui/android:ui_java",
-    ]
-
     if (enable_configuration_policy) {
-      apk_deps += [ "//components/policy/android:policy_java" ]
+      deps += [ "//components/policy/android:policy_java" ]
     }
   }
 
   # Desktop-only deps.
   if (!is_android && !is_ios) {
     deps += [
       "//components/audio_modem:unit_tests",
       "//components/copresence:unit_tests",
       "//components/feedback:unit_tests",
       "//components/gcm_driver/instance_id:unit_tests",
@@ skipping 172 matching lines @@
     sources += [ "test/android/browsertests_apk/components_browser_tests_jni_onload.cc" ]
     sources -= [ "autofill/content/browser/risk/fingerprint_browsertest.cc" ]
     deps += [
       "//content/test:layouttest_support",
       "//testing/android/native_test:native_test_support",
     ]
     use_default_launcher = false
     isolate_file = "components_browsertests.isolate"
     android_manifest =
         "${target_gen_dir}/components_browsertests_manifest/AndroidManifest.xml"
-    apk_deps = [
+    deps += [
       ":components_browsertests_assets",
       ":components_browsertests_java",
       ":components_browsertests_manifest",
     ]
   }
 
   if (is_linux) {
     # content_extractor_browsertest is a standalone content extraction tool built as
     # a MANUAL component_browsertest.
     sources += [ "dom_distiller/standalone/content_extractor_browsertest.cc" ]
@@ skipping 29 matching lines @@
   if (!is_ios) {
     deps += [
       "//base",
       "//base/test:test_support_perf",
       "//components/scheduler",
       "//components/visitedlink/browser",
       "//content/test:test_support",
     ]
   }
 }