Revert "Use a test specific macro to call JNI registrars during APK tests."

testing/android/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 logcat) markers identifying the
 // START/END/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 injects an event listener in gtest to detect various test stages and
 // installs signal handlers to detect crashes.
 
 #include <android/log.h>
 #include <signal.h>
 #include <stdio.h>
 
-#include "base/android/base_jni_registrar.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
+#include "base/android/locale_utils.h"
+#include "base/android/path_utils.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "gtest/gtest.h"
 #include "testing/android/jni/chrome_native_test_activity_jni.h"
 
-#if defined(REGISTER_NET_UNITTESTS_JNI)
-#include "net/android/net_jni_registrar.h"
-#endif
-
-#if defined(REGISTER_CONTENT_UNITTESTS_JNI)
-#include "content/app/android/content_jni_registrar.h"
-#endif
-
 // The main function of the program to be wrapped as a test apk.
 extern int main(int argc, char** argv);
 
 namespace {
 
 // The list of signals which are considered to be crashes.
 const int kExceptionSignals[] = {
   SIGSEGV, SIGABRT, SIGFPE, SIGILL, SIGBUS, -1
 };
 
@@ skipping 127 matching lines @@
   base::AtExitManager exit_manager;
 
   static const char* const kInitialArgv[] = { "ChromeTestActivity" };
   CommandLine::Init(arraysize(kInitialArgv), kInitialArgv);
 
   // Set the application context in base.
   base::android::ScopedJavaLocalRef<jobject> scoped_context(
       env, env->NewLocalRef(app_context));
   base::android::InitApplicationContext(scoped_context);
 
-  base::android::RegisterJni(env);
-
-  // A unittest target may define these macros to register JNI dependencies.
-  // These should only be defined if the target also depends on the
-  // corresponding registrar.
-#if defined(REGISTER_NET_UNITTESTS_JNI)
-  net::android::RegisterJni(env);
-#endif
-
-#if defined(REGISTER_CONTENT_UNITTESTS_JNI)
-  content::android::RegisterJni(env);
-#endif
+  base::android::RegisterLocaleUtils(env);
+  base::android::RegisterPathUtils(env);
 
   FilePath files_dir(base::android::ConvertJavaStringToUTF8(env, jfiles_dir));
   // A few options, such "--gtest_list_tests", will just use printf directly
   // and won't use the "AndroidLogPrinter". Redirect stdout to a known file.
   FilePath stdout_path(files_dir.Append(FilePath("stdout.txt")));
   freopen(stdout_path.value().c_str(), "w", stdout);
 
   std::vector<std::string> args;
   ParseArgsFromCommandLineFile(&args);
 
@@ skipping 15 matching lines @@
   InstallHandlers();
 
   base::android::InitVM(vm);
   JNIEnv* env = base::android::AttachCurrentThread();
   if (!RegisterNativesImpl(env)) {
     return -1;
   }
 
   return JNI_VERSION_1_4;
 }