Android: Instrumentation tests in gradle

build/android/gradle/dependencies.jinja

Index: build/android/gradle/dependencies.jinja
diff --git a/build/android/gradle/dependencies.jinja b/build/android/gradle/dependencies.jinja
index 7cc91eb694cafe41a6c2dc54a3a5ece0b9ccbaed..c7e884a8be63606aed0dc6d70339955526f7ae06 100644
--- a/build/android/gradle/dependencies.jinja
+++ b/build/android/gradle/dependencies.jinja
@@ -1,14 +1,22 @@
 {# Copyright 2016 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. #}
-dependencies {
-{% for path in prebuilts %}
-    {{ depCompileName }} files("{{ path }}")
+{% macro expand_deps(variables, prefix) %}
+{% if variables is defined %}
+{% for path in variables.prebuilts %}
+    {{ prefix }} files("{{ path }}")
 {% endfor %}
-{% for proj in java_project_deps %}
-    {{ depCompileName }} project(":{{ proj }}")
+{% for proj in variables.java_project_deps %}
+    {{ prefix }} project(":{{ proj }}")
 {% endfor %}
-{% for proj in android_project_deps %}
-    {{ depCompileName }} project(path: ":{{ proj }}", configuration: "debug")
+{% for proj in variables.android_project_deps %}
+    {{ prefix }} project(path: ":{{ proj }}", configuration: "debug")
 {% endfor %}
+{% endif %}
+{% endmacro %}
+
+dependencies {
+{{ expand_deps(main, 'compile') }}
+{{ expand_deps(test, 'testCompile') }}
+{{ expand_deps(android_test, 'androidTestCompile') }}
 }