[Cronet] Get Cronet performance test running again

components/cronet/android/BUILD.gn

Index: components/cronet/android/BUILD.gn
diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn
index dab63ff1b6703ab8bbca5a4e46f34d437912ed69..58d8f9426ece92b57e394acee393788213502d97 100644
--- a/components/cronet/android/BUILD.gn
+++ b/components/cronet/android/BUILD.gn
@@ -359,6 +359,8 @@ shared_library("cronet_tests") {
   testonly = true
   sources = [
     "test/cronet_test_jni.cc",
+    "test/cronet_test_util.cc",
+    "test/cronet_test_util.h",
     "test/cronet_url_request_context_config_test.cc",
     "test/cronet_url_request_context_config_test.h",
     "test/mock_cert_verifier.cc",
@@ -409,6 +411,8 @@ android_library("cronet_test_apk_java") {
     "//base:base_java",
     "//net/android:net_java_test_support",
   ]
+
+  run_findbugs = true
 }
 
 android_assets("cronet_test_apk_assets") {
@@ -464,15 +468,32 @@ android_apk("cronet_test_apk") {
   run_findbugs = true
 }
 
+android_library("cronet_javatests") {
+  testonly = true
+  DEPRECATED_java_in_dir = "test/javatests/src"
+
+  deps = [
+    ":cronet_api",
+    ":cronet_java",
+    ":cronet_test_apk_java",
+    "//base:base_java",
+    "//base:base_java_test_support",
+    "//net/android:net_java",
+    "//net/android:net_java_test_support",
+  ]
+
+  run_findbugs = true
+}
+
 instrumentation_test_apk("cronet_test_instrumentation_apk") {
   apk_name = "CronetTestInstrumentation"
   apk_under_test = ":cronet_test_apk"
   android_manifest = "test/javatests/AndroidManifest.xml"
-  DEPRECATED_java_in_dir = "test/javatests/src"
 
   deps = [
     ":cronet_api",
     ":cronet_java",
+    ":cronet_javatests",
     ":cronet_test_apk_java",
     "//base:base_java",
     "//base:base_java_test_support",
@@ -483,6 +504,43 @@ instrumentation_test_apk("cronet_test_instrumentation_apk") {
   run_findbugs = true
 }
 
+android_library("cronet_perf_test_apk_java") {
+  testonly = true
+  java_files =
+      [ "test/javaperftests/src/org/chromium/net/CronetPerfTestActivity.java" ]
+
+  deps = [
+    ":cronet_api",
+    ":cronet_java",
+    ":cronet_javatests",
+    ":cronet_test_apk_java",
+    "//base:base_java",
+  ]
+
+  run_findbugs = true
+}
+
+android_apk("cronet_perf_test_apk") {
+  testonly = true
+  apk_name = "CronetPerfTest"
+  android_manifest = "test/javaperftests/AndroidManifest.xml"
+  native_libs = [ "libcronet_tests.so" ]
+
+  deps = [
+    ":cronet_perf_test_apk_java",
+    ":cronet_test_apk_java",
+    ":cronet_tests",
+    "//base:base_java",
+  ]
+
+  run_findbugs = true
+  proguard_enabled = true
+  proguard_configs = [
+    "proguard.cfg",
+    "test/javaperftests/proguard.cfg",
+  ]
+}
+
 test("cronet_unittests") {
   sources = [
     "//components/cronet/histogram_manager_unittest.cc",