Revert of [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 93dc9155f0de31a884af2a502aa9cc5ed73e8144..ed917a7b85dbd368e932750f2d89acbe6c561ae7 100644
--- a/components/cronet/android/BUILD.gn
+++ b/components/cronet/android/BUILD.gn
@@ -371,8 +371,6 @@
   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",
@@ -436,8 +434,6 @@
     "//base:base_java",
     "//net/android:net_java_test_support",
   ]
-
-  run_findbugs = true
 
   if (cronet_enable_bidirectional_stream) {
     java_files += [
@@ -507,8 +503,10 @@
   run_findbugs = true
 }
 
-android_library("cronet_javatests") {
-  testonly = true
+instrumentation_test_apk("cronet_test_instrumentation_apk") {
+  apk_name = "CronetTestInstrumentation"
+  apk_under_test = ":cronet_test_apk"
+  android_manifest = "test/javatests/AndroidManifest.xml"
 
   java_files = [
     "test/javatests/src/org/chromium/net/ChromiumUrlRequestTest.java",
@@ -562,62 +560,6 @@
   }
 }
 
-instrumentation_test_apk("cronet_test_instrumentation_apk") {
-  apk_name = "CronetTestInstrumentation"
-  apk_under_test = ":cronet_test_apk"
-  android_manifest = "test/javatests/AndroidManifest.xml"
-
-  deps = [
-    ":cronet_api",
-    ":cronet_java",
-    ":cronet_javatests",
-    ":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
-}
-
-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",