Separate JNI registration with initialization

content/app/android/content_jni_onload.cc

Index: content/app/android/content_jni_onload.cc
diff --git a/content/app/android/content_jni_onload.cc b/content/app/android/content_jni_onload.cc
new file mode 100644
index 0000000000000000000000000000000000000000..dbc18bd81d1c3cddee5b6a62c6f98658a95cb847
--- /dev/null
+++ b/content/app/android/content_jni_onload.cc
@@ -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.
+
+#include "content/public/app/content_jni_onload.h"
+
+#include "base/android/base_jni_onload.h"
+#include "content/app/android/content_jni_onload_delegate.h"
+
+namespace content {
+namespace android {
+
+bool OnJNIOnLoad(JavaVM* vm,
+                 std::vector<base::android::JNIOnLoadDelegate*>* delegates) {
+  ContentJNIOnLoadDelegate delegate;
+  delegates->push_back(&delegate);
+  bool ret = base::android::OnJNIOnLoad(vm, delegates);
+  delegates->pop_back();
+  return ret;
+}
+
+}  // namespace android
+}  // namespace content