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

testing/android/native_test/native_test_launcher.cc

 // Copyright (c) 2012 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.
 
 // This class sets up the environment for running the native tests inside an
 // android application. It outputs (to a fifo) markers identifying the
 // START/PASSED/CRASH of the test suite, FAILURE/SUCCESS of individual tests,
 // etc.
 // These markers are read by the test runner script to generate test results.
 // It installs signal handlers to detect crashes.
 
 #include <android/log.h>
 #include <signal.h>
 
 #include "base/android/base_jni_registrar.h"
 #include "base/android/context_utils.h"
 #include "base/android/fifo_utils.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/at_exit.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
-#include "base/test/test_support_android.h"
 #include "gtest/gtest.h"
 #include "jni/NativeTest_jni.h"
 #include "testing/android/native_test/native_test_util.h"
 
 // The main function of the program to be wrapped as a test apk.
 extern int main(int argc, char** argv);
 
 namespace testing {
 namespace android {
 
@@ skipping 26 matching lines @@
 }
 
 }  // namespace
 
 static void RunTests(JNIEnv* env,
                      const JavaParamRef<jobject>& obj,
                      const JavaParamRef<jstring>& jcommand_line_flags,
                      const JavaParamRef<jstring>& jcommand_line_file_path,
                      const JavaParamRef<jstring>& jstdout_file_path,
                      jboolean jstdout_fifo,
-                     const JavaParamRef<jobject>& app_context,
-                     const JavaParamRef<jstring>& jtest_data_dir) {
+                     const JavaParamRef<jobject>& app_context) {
   // Command line initialized basically, will be fully initialized later.
   static const char* const kInitialArgv[] = { "ChromeTestActivity" };
   base::CommandLine::Init(arraysize(kInitialArgv), kInitialArgv);
 
   std::vector<std::string> args;
 
   const std::string command_line_file_path(
       base::android::ConvertJavaStringToUTF8(env, jcommand_line_file_path));
   if (command_line_file_path.empty())
     args.push_back("_");
@@ skipping 33 matching lines @@
   }
   dup2(STDOUT_FILENO, STDERR_FILENO);
 
   if (command_line.HasSwitch(switches::kWaitForDebugger)) {
     AndroidLog(ANDROID_LOG_VERBOSE,
                "Native test waiting for GDB because flag %s was supplied",
                switches::kWaitForDebugger);
     base::debug::WaitForDebugger(24 * 60 * 60, false);
   }
 
-  base::FilePath test_data_dir(
-      base::android::ConvertJavaStringToUTF8(env, jtest_data_dir));
-  base::InitAndroidTestPaths(test_data_dir);
-
   ScopedMainEntryLogger scoped_main_entry_logger;
   main(argc, &argv[0]);
 }
 
 bool RegisterNativeTestJNI(JNIEnv* env) {
   if (!base::android::RegisterJni(env)) {
     return false;
   }
   return RegisterNativesImpl(env);
 }
 
 // TODO(nileshagrawal): now that we're using FIFO, test scripts can detect EOF.
 // Remove the signal handlers.
 void InstallHandlers() {
   struct sigaction sa;
   memset(&sa, 0, sizeof(sa));
 
   sa.sa_sigaction = SignalHandler;
   sa.sa_flags = SA_SIGINFO;
 
   for (unsigned int i = 0; kExceptionSignals[i] != -1; ++i) {
     sigaction(kExceptionSignals[i], &sa, &g_old_sa[kExceptionSignals[i]]);
   }
 }
 
 }  // namespace android
 }  // namespace testing