Separate JNI registration with initialization

content/shell/android/browsertests_apk/content_browser_tests_jni_onload_delegate.h

Index: content/shell/android/browsertests_apk/content_browser_tests_jni_onload_delegate.h
diff --git a/content/shell/android/browsertests_apk/content_browser_tests_jni_onload_delegate.h b/content/shell/android/browsertests_apk/content_browser_tests_jni_onload_delegate.h
new file mode 100644
index 0000000000000000000000000000000000000000..18b54710de17bb829d81b0aa576bd7822ae6c703
--- /dev/null
+++ b/content/shell/android/browsertests_apk/content_browser_tests_jni_onload_delegate.h
@@ -0,0 +1,23 @@
+// 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.
+
+#ifndef CONTENT_SHELL_ANDROID_BROWSERTESTS_APK_CONTENT_BROWSER_TESTS_JNI_ONLOAD_DELEGATE_H_
+#define CONTENT_SHELL_ANDROID_BROWSERTESTS_APK_CONTENT_BROWSER_TESTS_JNI_ONLOAD_DELEGATE_H_
+
+#include "base/android/jni_onload_delegate.h"
+
+namespace content {
+namespace android {
+
+class ContentBrowserTestsJNIOnLoadDelegate :

[jam, 2015/01/26 22:38:22]

ditto: inline too

+      public base::android::JNIOnLoadDelegate {
+ public:
+  virtual bool RegisterJNI(JNIEnv* env) override;
+  virtual bool Init() override;
+};
+
+}  // namespace android
+}  // namespace content
+
+#endif  // CONTENT_SHELL_ANDROID_BROWSERTESTS_APK_CONTENT_BROWSER_TESTS_JNI_ONLOAD_DELEGATE_H_