Merging under test java into instrumentation test java.

chrome/android/BUILD.gn

Index: chrome/android/BUILD.gn
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index 15f80f9dc9e6e843c3ec7c679295aefe971e7aef..941373104290a89ae052b86956fba0e23f9c7e9b 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -566,27 +566,25 @@ jinja_template("chrome_sync_shell_test_apk_manifest") {
   variables = chrome_sync_shell_jinja_variables
 }
 
-if (!enable_all_proguard_optimizations) {
-  # GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk
-  instrumentation_test_apk("chrome_public_test_apk") {
-    apk_name = "ChromePublicTest"
-    apk_under_test = ":chrome_public_apk"
-    android_manifest = chrome_public_test_apk_manifest
-    android_manifest_dep = ":chrome_public_test_apk_manifest"
+# GYP: //chrome/android/chrome_apk.gyp:chrome_public_test_apk
+instrumentation_test_apk("chrome_public_test_apk") {
+  apk_name = "ChromePublicTest"
+  apk_under_test = ":chrome_public_apk"
+  android_manifest = chrome_public_test_apk_manifest
+  android_manifest_dep = ":chrome_public_test_apk_manifest"
 
-    deps = [
-      ":chrome_test_java",
-      "//chrome/android/webapk/libs/runtime_library:runtime_library_javatests",
-      "//chrome/android/webapk/shell_apk:shell_apk_javatests",
-    ]
-    additional_apks = [
-      "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk",
-      "//chrome/test/android/chrome_public_test_support:chrome_public_test_support_apk",
-      "//net/android:net_test_support_apk",
-    ]
-    isolate_file = "../chrome_public_test_apk.isolate"
-    proguard_enabled = !is_java_debug
-  }
+  deps = [
+    ":chrome_test_java",
+    "//chrome/android/webapk/libs/runtime_library:runtime_library_javatests",
+    "//chrome/android/webapk/shell_apk:shell_apk_javatests",
+  ]
+  additional_apks = [
+    "//chrome/android/webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk",
+    "//chrome/test/android/chrome_public_test_support:chrome_public_test_support_apk",
+    "//net/android:net_test_support_apk",
+  ]
+  isolate_file = "../chrome_public_test_apk.isolate"
+  proguard_enabled = !is_java_debug
 }
 
 android_library("chrome_sync_shell_test_apk_java") {
@@ -613,16 +611,14 @@ android_library("chrome_sync_shell_test_apk_java") {
   ]
 }
 
-if (!enable_all_proguard_optimizations) {
-  # GYP: //chrome/android/chrome_apk.gyp:chrome_sync_shell_test_apk
-  instrumentation_test_apk("chrome_sync_shell_test_apk") {
-    apk_name = "ChromeSyncShellTest"
-    apk_under_test = ":chrome_sync_shell_apk"
-    android_manifest = chrome_sync_shell_test_apk_manifest
-    android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
-    deps = [
-      ":chrome_sync_shell_test_apk_java",
-    ]
-    proguard_enabled = !is_java_debug
-  }
+# GYP: //chrome/android/chrome_apk.gyp:chrome_sync_shell_test_apk
+instrumentation_test_apk("chrome_sync_shell_test_apk") {
+  apk_name = "ChromeSyncShellTest"
+  apk_under_test = ":chrome_sync_shell_apk"
+  android_manifest = chrome_sync_shell_test_apk_manifest
+  android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
+  deps = [
+    ":chrome_sync_shell_test_apk_java",
+  ]
+  proguard_enabled = !is_java_debug
 }