GN: Merge apk_deps and deps in test() template

components/BUILD.gn

Index: components/BUILD.gn
diff --git a/components/BUILD.gn b/components/BUILD.gn
index b72787f42df01227358fdb604d536203b3fb47d4..418a5ddd8334e0f3882e84389e7ce1179efc7767 100644
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -496,7 +496,7 @@ test("components_unittests") {
       deps += [ "//content/public/android:content_java" ]
       deps -= [ "//components/gcm_driver/instance_id:unit_tests" ]
 
-      apk_deps = [
+      deps += [

[tfarina, 2015/11/20 18:56:06]

want to combine this with the above deps list now?

[agrieve, 2015/11/20 20:06:14]

Done.

         "//components/invalidation/impl:java",
         "//components/safe_json/android:safe_json_java",
         "//components/signin/core/browser/android:java",
@@ -506,7 +506,7 @@ test("components_unittests") {
       ]
 
       if (enable_configuration_policy) {
-        apk_deps += [ "//components/policy/android:policy_java" ]
+        deps += [ "//components/policy/android:policy_java" ]
       }
     }
     if (is_chromeos) {
@@ -685,7 +685,7 @@ test("components_browsertests") {
     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",