Upstream oodles of Chrome for Android code into Chromium.

chrome/browser/android/chrome_staging_jni_onload.h

Index: chrome/browser/android/chrome_staging_jni_onload.h
diff --git a/chrome/browser/android/java_exception_reporter.h b/chrome/browser/android/chrome_staging_jni_onload.h
similarity index 51%
copy from chrome/browser/android/java_exception_reporter.h
copy to chrome/browser/android/chrome_staging_jni_onload.h
index 6b7e00c6960e2d903e5e28800e7eb5057c2dcbaf..3700af6e97ebd3161c462e4780119b0440440008 100644
--- a/chrome/browser/android/java_exception_reporter.h
+++ b/chrome/browser/android/chrome_staging_jni_onload.h
@@ -2,18 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_ANDROID_JAVA_EXCEPTION_REPORTER_H_
-#define CHROME_BROWSER_ANDROID_JAVA_EXCEPTION_REPORTER_H_
+#ifndef CHROME_BROWSER_ANDROID_CHROME_STAGING_JNI_ONLOAD_H_
+#define CHROME_BROWSER_ANDROID_CHROME_STAGING_JNI_ONLOAD_H_
 
 #include <jni.h>
 
 namespace chrome {
 namespace android {
 
-void InitJavaExceptionReporter();
-bool RegisterJavaExceptionReporterJni(JNIEnv* env);
+bool OnJNIOnLoadRegisterJNI(JavaVM* vm);
+
+bool OnJNIOnLoadInit();
 
 }  // namespace android
 }  // namespace chrome
 
-#endif  // CHROME_BROWSER_ANDROID_JAVA_EXCEPTION_REPORTER_H_
+#endif  // CHROME_BROWSER_ANDROID_CHROME_STAGING_JNI_ONLOAD_H_