Fix naming for JNI registration methods

Change-Id: I1aba39bdcf217bff751e42d2a335cd230b8193f7

14 files changed, 42 insertions, 42 deletions

diff --git a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp
index 5e57c6e..975b439 100644
--- a/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/MediaPlayerPrivateAndroid.cpp
@@ -503,13 +503,13 @@ static JNINativeMethod g_MediaAudioPlayerMethods[] = {
         (void*) OnTimeupdate },
 };
 
-int register_mediaplayer_video(JNIEnv* env)
+int registerMediaPlayerVideo(JNIEnv* env)
 {
     return jniRegisterNativeMethods(env, g_ProxyJavaClass,
             g_MediaPlayerMethods, NELEM(g_MediaPlayerMethods));
 }
 
-int register_mediaplayer_audio(JNIEnv* env)
+int registerMediaPlayerAudio(JNIEnv* env)
 {
     return jniRegisterNativeMethods(env, g_ProxyJavaClassAudio,
             g_MediaAudioPlayerMethods, NELEM(g_MediaAudioPlayerMethods));
diff --git a/WebKit/android/jni/DeviceMotionAndOrientationManager.cpp b/WebKit/android/jni/DeviceMotionAndOrientationManager.cpp
index 0f94f16..ad96c6c 100644
--- a/WebKit/android/jni/DeviceMotionAndOrientationManager.cpp
+++ b/WebKit/android/jni/DeviceMotionAndOrientationManager.cpp
@@ -157,7 +157,7 @@ static JNINativeMethod gDeviceMotionAndOrientationManagerMethods[] = {
     { "nativeOnOrientationChange", "(Landroid/webkit/WebViewCore;ZDZDZD)V", (void*) onOrientationChange }
 };
 
-int register_device_orientation_manager(JNIEnv* env)
+int registerDeviceMotionAndOrientationManager(JNIEnv* env)
 {
     jclass deviceOrientationManager = env->FindClass(javaDeviceMotionAndOrientationManagerClass);
     LOG_ASSERT(deviceOrientationManager, "Unable to find class");
diff --git a/WebKit/android/jni/GeolocationPermissionsBridge.cpp b/WebKit/android/jni/GeolocationPermissionsBridge.cpp
index 782f7ce..5fea9a4 100755
--- a/WebKit/android/jni/GeolocationPermissionsBridge.cpp
+++ b/WebKit/android/jni/GeolocationPermissionsBridge.cpp
@@ -96,7 +96,7 @@ static JNINativeMethod gGeolocationPermissionsMethods[] = {
         (void*) clearAll }
 };
 
-int register_geolocation_permissions(JNIEnv* env)
+int registerGeolocationPermissions(JNIEnv* env)
 {
     const char* kGeolocationPermissionsClass = "android/webkit/GeolocationPermissions";
     jclass geolocationPermissions = env->FindClass(kGeolocationPermissionsClass);
diff --git a/WebKit/android/jni/JavaBridge.cpp b/WebKit/android/jni/JavaBridge.cpp
index 33a1c2a..9574739 100644
--- a/WebKit/android/jni/JavaBridge.cpp
+++ b/WebKit/android/jni/JavaBridge.cpp
@@ -485,7 +485,7 @@ static JNINativeMethod gWebCoreJavaBridgeMethods[] = {
         (void*) JavaBridge::RemovePackageName }
 };
 
-int register_javabridge(JNIEnv* env)
+int registerJavaBridge(JNIEnv* env)
 {
     jclass javaBridge = env->FindClass("android/webkit/JWebCoreJavaBridge");
     LOG_FATAL_IF(javaBridge == NULL, "Unable to find class android/webkit/JWebCoreJavaBridge");
diff --git a/WebKit/android/jni/MockGeolocation.cpp b/WebKit/android/jni/MockGeolocation.cpp
index 1e110e7..d10ff83 100755
--- a/WebKit/android/jni/MockGeolocation.cpp
+++ b/WebKit/android/jni/MockGeolocation.cpp
@@ -70,7 +70,7 @@ static JNINativeMethod gMockGeolocationMethods[] = {
     { "nativeSetError", "(ILjava/lang/String;)V", (void*) setError }
 };
 
-int register_mock_geolocation(JNIEnv* env)
+int registerMockGeolocation(JNIEnv* env)
 {
     jclass mockGeolocation = env->FindClass(javaMockGeolocationClass);
     LOG_ASSERT(mockGeolocation, "Unable to find class");
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index 6b3f009..f0cf62b 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -1918,7 +1918,7 @@ static JNINativeMethod gBrowserFrameNativeMethods[] = {
         (void*) AuthenticationCancel },
 };
 
-int register_webframe(JNIEnv* env)
+int registerWebFrame(JNIEnv* env)
 {
     jclass clazz = env->FindClass("android/webkit/BrowserFrame");
     LOG_ASSERT(clazz, "Cannot find BrowserFrame");
diff --git a/WebKit/android/jni/WebCoreJniOnLoad.cpp b/WebKit/android/jni/WebCoreJniOnLoad.cpp
index adedf9c..7cf8d94 100644
--- a/WebKit/android/jni/WebCoreJniOnLoad.cpp
+++ b/WebKit/android/jni/WebCoreJniOnLoad.cpp
@@ -71,24 +71,24 @@
 
 namespace android {
 
-extern int register_webframe(JNIEnv*);
-extern int register_javabridge(JNIEnv*);
-extern int register_resource_loader(JNIEnv*);
-extern int register_webviewcore(JNIEnv*);
-extern int register_webhistory(JNIEnv*);
-extern int register_webicondatabase(JNIEnv*);
-extern int register_websettings(JNIEnv*);
-extern int register_webview(JNIEnv*);
+extern int registerWebFrame(JNIEnv*);
+extern int registerJavaBridge(JNIEnv*);
+extern int registerResourceLoader(JNIEnv*);
+extern int registerWebViewCore(JNIEnv*);
+extern int registerWebHistory(JNIEnv*);
+extern int registerWebIconDatabase(JNIEnv*);
+extern int registerWebSettings(JNIEnv*);
+extern int registerWebView(JNIEnv*);
 #if ENABLE(DATABASE)
-extern int register_webstorage(JNIEnv*);
+extern int registerWebStorage(JNIEnv*);
 #endif
-extern int register_geolocation_permissions(JNIEnv*);
-extern int register_mock_geolocation(JNIEnv*);
+extern int registerGeolocationPermissions(JNIEnv*);
+extern int registerMockGeolocation(JNIEnv*);
 #if ENABLE(VIDEO)
-extern int register_mediaplayer_audio(JNIEnv*);
-extern int register_mediaplayer_video(JNIEnv*);
+extern int registerMediaPlayerAudio(JNIEnv*);
+extern int registerMediaPlayerVideo(JNIEnv*);
 #endif
-extern int register_device_orientation_manager(JNIEnv*);
+extern int registerDeviceMotionAndOrientationManager(JNIEnv*);
 
 }
 
@@ -98,24 +98,24 @@ struct RegistrationMethod {
 };
 
 static RegistrationMethod gWebCoreRegMethods[] = {
-    { "JavaBridge", android::register_javabridge },
-    { "WebFrame", android::register_webframe },
-    { "WebCoreResourceLoader", android::register_resource_loader },
-    { "WebViewCore", android::register_webviewcore },
-    { "WebHistory", android::register_webhistory },
-    { "WebIconDatabase", android::register_webicondatabase },
-    { "WebSettings", android::register_websettings },
+    { "JavaBridge", android::registerJavaBridge },
+    { "WebFrame", android::registerWebFrame },
+    { "WebCoreResourceLoader", android::registerResourceLoader },
+    { "WebViewCore", android::registerWebViewCore },
+    { "WebHistory", android::registerWebHistory },
+    { "WebIconDatabase", android::registerWebIconDatabase },
+    { "WebSettings", android::registerWebSettings },
 #if ENABLE(DATABASE)
-    { "WebStorage", android::register_webstorage },
+    { "WebStorage", android::registerWebStorage },
 #endif
-    { "WebView", android::register_webview },
-    { "GeolocationPermissions", android::register_geolocation_permissions },
-    { "MockGeolocation", android::register_mock_geolocation },
+    { "WebView", android::registerWebView },
+    { "GeolocationPermissions", android::registerGeolocationPermissions },
+    { "MockGeolocation", android::registerMockGeolocation },
 #if ENABLE(VIDEO)
-    { "HTML5Audio", android::register_mediaplayer_audio },
-    { "HTML5VideoViewProxy", android::register_mediaplayer_video },
+    { "HTML5Audio", android::registerMediaPlayerAudio },
+    { "HTML5VideoViewProxy", android::registerMediaPlayerVideo },
 #endif
-    { "DeviceMotionAndOrientationManager", android::register_device_orientation_manager },
+    { "DeviceMotionAndOrientationManager", android::registerDeviceMotionAndOrientationManager },
 };
 
 EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved)
diff --git a/WebKit/android/jni/WebCoreResourceLoader.cpp b/WebKit/android/jni/WebCoreResourceLoader.cpp
index a60a1b1..06f0021 100644
--- a/WebKit/android/jni/WebCoreResourceLoader.cpp
+++ b/WebKit/android/jni/WebCoreResourceLoader.cpp
@@ -316,7 +316,7 @@ static JNINativeMethod gResourceloaderMethods[] = {
         (void*) WebCoreResourceLoader::Error }
 };
 
-int register_resource_loader(JNIEnv* env)
+int registerResourceLoader(JNIEnv* env)
 {
     jclass resourceLoader = env->FindClass("android/webkit/LoadListener");
     LOG_FATAL_IF(resourceLoader == NULL, 
diff --git a/WebKit/android/jni/WebHistory.cpp b/WebKit/android/jni/WebHistory.cpp
index 1ef8b8b..474574e 100644
--- a/WebKit/android/jni/WebHistory.cpp
+++ b/WebKit/android/jni/WebHistory.cpp
@@ -794,7 +794,7 @@ static JNINativeMethod gWebHistoryItemMethods[] = {
         (void*) WebHistoryInflate }
 };
 
-int register_webhistory(JNIEnv* env)
+int registerWebHistory(JNIEnv* env)
 {
     // Get notified of all changes to history items.
     WebCore::notifyHistoryItemChanged = historyItemChanged;
diff --git a/WebKit/android/jni/WebIconDatabase.cpp b/WebKit/android/jni/WebIconDatabase.cpp
index 7619fa1..8f5aa87 100644
--- a/WebKit/android/jni/WebIconDatabase.cpp
+++ b/WebKit/android/jni/WebIconDatabase.cpp
@@ -204,7 +204,7 @@ static JNINativeMethod gWebIconDatabaseMethods[] = {
         (void*) ReleaseIconForPageUrl }
 };
 
-int register_webicondatabase(JNIEnv* env)
+int registerWebIconDatabase(JNIEnv* env)
 {
     jclass webIconDB = env->FindClass("android/webkit/WebIconDatabase");
     LOG_ASSERT(webIconDB, "Unable to find class android.webkit.WebIconDatabase");
diff --git a/WebKit/android/jni/WebSettings.cpp b/WebKit/android/jni/WebSettings.cpp
index e3f59c3..6dc5439 100644
--- a/WebKit/android/jni/WebSettings.cpp
+++ b/WebKit/android/jni/WebSettings.cpp
@@ -529,7 +529,7 @@ static JNINativeMethod gWebSettingsMethods[] = {
         (void*) WebSettings::Sync }
 };
 
-int register_websettings(JNIEnv* env)
+int registerWebSettings(JNIEnv* env)
 {
     jclass clazz = env->FindClass("android/webkit/WebSettings");
     LOG_ASSERT(clazz, "Unable to find class WebSettings!");
diff --git a/WebKit/android/jni/WebStorage.cpp b/WebKit/android/jni/WebStorage.cpp
index f2a3877..10e0de0 100644
--- a/WebKit/android/jni/WebStorage.cpp
+++ b/WebKit/android/jni/WebStorage.cpp
@@ -163,7 +163,7 @@ static JNINativeMethod gWebStorageMethods[] = {
         (void*) SetAppCacheMaximumSize }
 };
 
-int register_webstorage(JNIEnv* env)
+int registerWebStorage(JNIEnv* env)
 {
     jclass webStorage = env->FindClass("android/webkit/WebStorage");
     LOG_ASSERT(webStorage, "Unable to find class android.webkit.WebStorage");
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index b776aa8..fe0563a 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -4060,7 +4060,7 @@ static JNINativeMethod gJavaWebViewCoreMethods[] = {
         (void*) AutoFillForm },
 };
 
-int register_webviewcore(JNIEnv* env)
+int registerWebViewCore(JNIEnv* env)
 {
     jclass widget = env->FindClass("android/webkit/WebViewCore");
     LOG_ASSERT(widget,
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp
index a9e5e10..284f1c9 100644
--- a/WebKit/android/nav/WebView.cpp
+++ b/WebKit/android/nav/WebView.cpp
@@ -2388,7 +2388,7 @@ static JNINativeMethod gJavaWebViewMethods[] = {
         (void*) nativeScrollLayer },
 };
 
-int register_webview(JNIEnv* env)
+int registerWebView(JNIEnv* env)
 {
     jclass clazz = env->FindClass("android/webkit/WebView");
     LOG_ASSERT(clazz, "Unable to find class android/webkit/WebView");