Revert of [Cronet] Get Cronet performance test running again

components/cronet/android/BUILD.gn

 # Copyright 2015 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/buildflag_header.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/util/version.gni")
 import("//chrome/version.gni")
 import("//testing/test.gni")
@@ skipping 353 matching lines @@
     "test/src/org/chromium/net/SdchObserver.java",
     "test/src/org/chromium/net/TestUploadDataStreamHandler.java",
   ]
   jni_package = "cronet_tests"
 }
 
 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",
     "test/mock_cert_verifier.h",
     "test/mock_url_request_job_factory.cc",
     "test/mock_url_request_job_factory.h",
     "test/native_test_server.cc",
     "test/native_test_server.h",
     "test/network_change_notifier_util.cc",
     "test/network_change_notifier_util.h",
@@ skipping 44 matching lines @@
     "test/src/org/chromium/net/QuicTestServer.java",
   ]
 
   deps = [
     ":cronet_api",
     ":cronet_java",
     "//base:base_java",
     "//net/android:net_java_test_support",
   ]
 
-  run_findbugs = true
-
   if (cronet_enable_bidirectional_stream) {
     java_files += [
       "test/src/org/chromium/net/Http2TestHandler.java",
       "test/src/org/chromium/net/Http2TestServer.java",
     ]
 
     deps += [
       "//third_party/netty-tcnative:netty-tcnative",
       "//third_party/netty4:netty_all",
     ]
@@ skipping 48 matching lines @@
     ":cronet_test_apk_java",
     ":cronet_test_apk_resources",
     ":cronet_tests",
     "//base:base_java",
     "//third_party/netty-tcnative:netty-tcnative_all",
   ]
 
   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",
     "test/javatests/src/org/chromium/net/ChunkedWritableByteChannelTest.java",
     "test/javatests/src/org/chromium/net/ContextInitTest.java",
     "test/javatests/src/org/chromium/net/Criteria.java",
     "test/javatests/src/org/chromium/net/CronetTestBase.java",
     "test/javatests/src/org/chromium/net/CronetUploadTest.java",
     "test/javatests/src/org/chromium/net/CronetUrlRequestContextTest.java",
     "test/javatests/src/org/chromium/net/CronetUrlRequestTest.java",
@@ skipping 33 matching lines @@
   run_findbugs = true
 
   if (cronet_enable_bidirectional_stream) {
     java_files += [
       "test/javatests/src/org/chromium/net/BidirectionalStreamTest.java",
       "test/javatests/src/org/chromium/net/TestBidirectionalStreamCallback.java",
     ]
   }
 }
 
-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",
     "//components/cronet/run_all_unittests.cc",
     "//components/cronet/url_request_context_config_unittest.cc",
   ]
 
   deps = [
     ":cronet_static",
     "//base",
@@ skipping 186 matching lines @@
     ":jar_cronet_sample_source",
     ":repackage_extracted_jars",
   ]
 }
 
 buildflag_header("features") {
   header = "../cronet_features.h"
 
   flags = [ "ENABLE_BIDIRECTIONAL_STREAM=$cronet_enable_bidirectional_stream" ]
 }