Revert of [Android] Refactor the native test wrappers.

testing/android/native_test/native_test_jni_onload.cc

 // 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.
 
 #include "base/android/base_jni_onload.h"
 #include "base/android/jni_android.h"
 #include "base/bind.h"
 #include "testing/android/native_test/native_test_launcher.h"
 
 namespace {
 
 bool RegisterJNI(JNIEnv* env) {
-  return testing::android::RegisterNativeTestJNI(env);
+  return RegisterNativeTestJNI(env);
 }
 
 bool Init() {
-  testing::android::InstallHandlers();
+  InstallHandlers();
   return true;
 }
 
 }  // namespace
 
 
 // This is called by the VM when the shared library is first loaded.
 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
   std::vector<base::android::RegisterCallback> register_callbacks;
   register_callbacks.push_back(base::Bind(&RegisterJNI));
 
   if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks))
     return -1;
 
   std::vector<base::android::InitCallback> init_callbacks;
   init_callbacks.push_back(base::Bind(&Init));
   if (!base::android::OnJNIOnLoadInit(init_callbacks))
     return -1;
 
   return JNI_VERSION_1_4;
 }