Separate JNI registration with initialization

content/shell/android/browsertests_apk/content_browser_tests_android.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 content browser tests
 // inside an android application.
 
 #include <android/log.h>
 #include <unistd.h>
 
 #include "base/android/base_jni_registrar.h"
 #include "base/android/fifo_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/library_loader/library_loader_hooks.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
-#include "content/public/app/android_library_loader_hooks.h"
-#include "content/public/app/content_main.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/test/nested_message_pump_android.h"
 #include "content/public/test/test_launcher.h"
 #include "content/shell/android/shell_jni_registrar.h"
 #include "content/shell/app/shell_main_delegate.h"
 #include "jni/ContentBrowserTestsActivity_jni.h"
 #include "media/base/media_switches.h"
 #include "testing/android/native_test_util.h"
 
 using testing::native_test_util::ArgsToArgv;
 using testing::native_test_util::ParseArgsFromCommandLineFile;
 using testing::native_test_util::ScopedMainEntryLogger;
@@ skipping 51 matching lines @@
   base::FilePath files_dir(
       base::android::ConvertJavaStringToUTF8(env, jfiles_dir));
   base::FilePath fifo_path(files_dir.Append(base::FilePath("test.fifo")));
   base::android::CreateFIFO(fifo_path, 0666);
   base::android::RedirectStream(stdout, fifo_path, "w");
   dup2(STDOUT_FILENO, STDERR_FILENO);
 
   ScopedMainEntryLogger scoped_main_entry_logger;
   main(argc, &argv[0]);
 }
+
+bool RegisterContentBrowserTestsAndroid(JNIEnv* env) {
+  return RegisterNativesImpl(env);
+}
+
 }  // namespace content
-
-// This is called by the VM when the shared library is first loaded.
-JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
-
-  base::android::SetLibraryLoadedHook(&content::LibraryLoaded);
-
-  base::android::InitVM(vm);
-  JNIEnv* env = base::android::AttachCurrentThread();
-
-  if (!base::android::RegisterLibraryLoaderEntryHook(env))
-    return -1;
-
-  if (!content::android::RegisterShellJni(env))
-    return -1;
-
-  if (!content::NestedMessagePumpAndroid::RegisterJni(env))
-    return -1;
-
-  if (!content::RegisterNativesImpl(env))
-    return -1;
-
-  content::SetContentMainDelegate(new content::ShellMainDelegate());
-  return JNI_VERSION_1_4;
-}