Revert of 👔 Reland of Move side-loaded test data /sdcard -> /sdcard/gtestdata

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 412 matching lines @@
     "test/test_upload_data_stream_handler.cc",
     "test/test_upload_data_stream_handler.h",
   ]
 
   deps = [
     ":cronet_static",
     ":cronet_tests_jni_headers",
     ":cronet_version_header",
     "//base",
     "//base:i18n",
-    "//base/test:test_support",
     "//net",
     "//net:simple_quic_tools",
     "//net:test_support",
     "//third_party/icu",
   ]
 
   include_dirs = [ _cronet_version_header_include_dir ]
 
   ldflags = [ "-Wl,--version-script=" +
               rebase_path("//components/cronet/android/only_jni_exports.lst") ]
@@ skipping 30 matching lines @@
     "test/src/org/chromium/net/QuicTestServer.java",
     "test/src/org/chromium/net/SdchObserver.java",
     "test/src/org/chromium/net/TestFilesInstaller.java",
     "test/src/org/chromium/net/TestUploadDataStreamHandler.java",
   ]
 
   deps = [
     ":cronet_api",
     ":cronet_java",
     "//base:base_java",
-    "//base:base_java_test_support",
     "//net/android:net_java_test_support",
     "//third_party/netty-tcnative:netty-tcnative",
     "//third_party/netty4:netty_all",
   ]
 
   run_findbugs_override = true
 }
 
 android_assets("cronet_test_apk_assets") {
   testonly = true
@@ skipping 376 matching lines @@
     ":cronet_package_copy_native_lib",
     ":cronet_package_copy_native_lib_unstripped",
     ":generate_javadoc",
     ":generate_licenses",
     ":jar_cronet_api_source",
     ":jar_cronet_other_source",
     ":jar_cronet_sample_source",
     ":repackage_extracted_jars",
   ]
 }