Separate JNI registration with initialization

content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc

Index: content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc
diff --git a/content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc b/content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc
new file mode 100644
index 0000000000000000000000000000000000000000..05ab38c19632d36a9661f17c15fc999c6f336a87
--- /dev/null
+++ b/content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc
@@ -0,0 +1,21 @@
+// 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 <vector>
+
+#include "base/android/jni_android.h"
+#include "content/public/app/content_jni_onload.h"
+#include "content/shell/android/browsertests_apk/content_browser_tests_jni_onload_delegate.h"
+
+// This is called by the VM when the shared library is first loaded.
+JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
+  content::android::ContentBrowserTestsJNIOnLoadDelegate delegate;
+  std::vector<base::android::JNIOnLoadDelegate*> delegates;
+  delegates.push_back(&delegate);
+
+  if (!content::android::OnJNIOnLoad(vm, &delegates))
+    return -1;
+
+  return JNI_VERSION_1_4;
+}