Separate JNI registration with initialization

content/shell/android/browsertests_apk/content_browser_tests_jni_onload_delegate.cc

Index: content/shell/android/browsertests_apk/content_browser_tests_jni_onload_delegate.cc
diff --git a/content/shell/android/browsertests_apk/content_browser_tests_jni_onload_delegate.cc b/content/shell/android/browsertests_apk/content_browser_tests_jni_onload_delegate.cc
new file mode 100644
index 0000000000000000000000000000000000000000..921dfff309ae3a33dd794edeb350958c879891ab
--- /dev/null
+++ b/content/shell/android/browsertests_apk/content_browser_tests_jni_onload_delegate.cc
@@ -0,0 +1,28 @@
+// 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 "content/shell/android/browsertests_apk/content_browser_tests_jni_onload_delegate.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"
+
+namespace content {
+namespace android {
+
+bool ContentBrowserTestsJNIOnLoadDelegate::RegisterJNI(JNIEnv* env) {
+  return content::android::RegisterShellJni(env) &&
+      content::NestedMessagePumpAndroid::RegisterJni(env) &&
+      content::RegisterContentBrowserTestsAndroid(env);
+}
+
+bool ContentBrowserTestsJNIOnLoadDelegate::Init() {
+  content::SetContentMainDelegate(new content::ShellMainDelegate());
+  return true;
+}
+
+}  // namespace android
+}  // namespace content