Merging under test java into instrumentation test java.

chrome/android/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/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build_overrides/v8.gni")
 import("//chrome/android/chrome_public_apk_tmpl.gni")
 import("//chrome/common/features.gni")
 import("//chrome/version.gni")
@@ skipping 548 matching lines @@
   variables = chrome_public_jinja_variables
 }
 
 # GYP: //chrome/android/chrome_apk.gyp:chrome_sync_shell_test_apk_manifest
 jinja_template("chrome_sync_shell_test_apk_manifest") {
   input = "sync_shell/javatests/AndroidManifest.xml"
   output = 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") {
   testonly = true
 
   # From java_sources.jni.
   java_files = sync_shell_test_java_sources
 
   deps = [
     "//base:base_java",
     "//base:base_java_test_support",
     "//chrome/android:chrome_java",
     "//chrome/test/android:chrome_java_test_support",
     "//components/bookmarks/common/android:bookmarks_java",
     "//components/policy/android:policy_java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//sync:sync_java_test_support",
     "//sync:test_support_sync_proto_java",
     "//sync/android:sync_java",
     "//third_party/android_protobuf:protobuf_nano_javalib",
     "//third_party/android_tools:android_support_v7_appcompat_java",
     "//ui/android:ui_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
 }