Enable components_browsertests on Android

components/test/android/browsertests_apk/components_browser_tests_jni_onload.cc

Index: components/test/android/browsertests_apk/components_browser_tests_jni_onload.cc
diff --git a/content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc b/components/test/android/browsertests_apk/components_browser_tests_jni_onload.cc
similarity index 85%
copy from content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc
copy to components/test/android/browsertests_apk/components_browser_tests_jni_onload.cc
index 26f93d4a1f2bfc80442f4a5525bf50d1b65b0f5a..e47b8403f8f8b3cd24abc101373d6b9a56eb7bf2 100644
--- a/content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc
+++ b/components/test/android/browsertests_apk/components_browser_tests_jni_onload.cc
@@ -4,10 +4,10 @@
 
 #include "base/android/jni_android.h"
 #include "base/bind.h"
+#include "components/test/android/browsertests_apk/components_browser_tests_android.h"
 #include "content/public/app/content_jni_onload.h"
 #include "content/public/app/content_main.h"
 #include "content/public/test/nested_message_pump_android.h"
-#include "content/shell/android/browsertests_apk/content_browser_tests_android.h"
 #include "content/shell/android/shell_jni_registrar.h"
 #include "content/shell/app/shell_main_delegate.h"
 
@@ -15,8 +15,8 @@ namespace {
 
 bool RegisterJNI(JNIEnv* env) {
   return content::android::RegisterShellJni(env) &&
-      content::NestedMessagePumpAndroid::RegisterJni(env) &&
-      content::RegisterContentBrowserTestsAndroid(env);
+         content::NestedMessagePumpAndroid::RegisterJni(env) &&
+         components::RegisterComponentsBrowserTestsAndroid(env);
 }
 
 bool Init() {
@@ -26,7 +26,6 @@ bool Init() {
 
 }  // 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;