Separate JNI registration with initialization

content/app/android/content_jni_onload_delegate.h

Index: content/app/android/content_jni_onload_delegate.h
diff --git a/content/app/android/content_jni_onload_delegate.h b/content/app/android/content_jni_onload_delegate.h
new file mode 100644
index 0000000000000000000000000000000000000000..8ef88031e178ff8294a87df967dcd1758ddfdf94
--- /dev/null
+++ b/content/app/android/content_jni_onload_delegate.h
@@ -0,0 +1,24 @@
+// 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_APP_ANDROID_CONTENT_JNI_ONLOAD_DELEGATE_H_
+#define CONTENT_APP_ANDROID_CONTENT_JNI_ONLOAD_DELEGATE_H_
+
+#include "base/android/jni_onload_delegate.h"
+#include "content/common/content_export.h"
+
+namespace content {
+namespace android {
+
+class ContentJNIOnLoadDelegate

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

ditto, inline this in the one file that uses it

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