Cherry-pick WebKit change 53497 to rename jni_utility and jni_utility_private to JNIUtility and JNIUtilityPrivate

See http://trac.webkit.org/changeset/53497
This is required to sync the Android tree with webkit.org to allow unforking in WebCore/bridge.

This change required updating headers in Android-specific files in WebCore and WebKit.

Change-Id: I4b80eb3eadcff66cbd261aa6ccef0f37927250b1

12 files changed, 23 insertions, 23 deletions

diff --git a/WebCore/bridge/jni/jni_utility.cpp b/WebCore/bridge/jni/JNIUtility.cpp
index faa7a8b..d2ac475 100644
--- a/WebCore/bridge/jni/jni_utility.cpp
+++ b/WebCore/bridge/jni/JNIUtility.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "jni_utility.h"
+#include "JNIUtility.h"
 
 #if ENABLE(MAC_JAVA_BRIDGE)
 
diff --git a/WebCore/bridge/jni/jni_utility.h b/WebCore/bridge/jni/JNIUtility.h
index 66b3b2f..4d17040 100644
--- a/WebCore/bridge/jni/jni_utility.h
+++ b/WebCore/bridge/jni/JNIUtility.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#ifndef _JNI_UTILITY_H_
-#define _JNI_UTILITY_H_
+#ifndef JNIUtility_h
+#define JNIUtility_h
 
 #if ENABLE(MAC_JAVA_BRIDGE)
 
@@ -279,4 +279,4 @@ T callJNIStaticMethod(jclass cls, const char* methodName, const char* methodSign
 
 #endif // ENABLE(MAC_JAVA_BRIDGE)
 
-#endif // _JNI_UTILITY_H_
+#endif // JNIUtility_h
diff --git a/WebCore/bridge/jni/jni_jsobject.mm b/WebCore/bridge/jni/jni_jsobject.mm
index 6683af6..2d288b4 100644
--- a/WebCore/bridge/jni/jni_jsobject.mm
+++ b/WebCore/bridge/jni/jni_jsobject.mm
@@ -29,13 +29,13 @@
 #if ENABLE(MAC_JAVA_BRIDGE)
 
 #include "Frame.h"
+#include "JNIUtility.h"
+#include "JNIUtilityPrivate.h"
 #include "JSDOMBinding.h"
 #include "ScriptController.h"
 #include "StringSourceProvider.h"
 #include "WebCoreFrameView.h"
 #include "jni_runtime.h"
-#include "jni_utility.h"
-#include "jni_utility_private.h"
 #include "runtime_object.h"
 #include "runtime_root.h"
 #include <interpreter/CallFrame.h>
diff --git a/WebCore/bridge/jni/jni_objc.mm b/WebCore/bridge/jni/jni_objc.mm
index fb2d694..e2e71c5 100644
--- a/WebCore/bridge/jni/jni_objc.mm
+++ b/WebCore/bridge/jni/jni_objc.mm
@@ -28,8 +28,8 @@
 #if ENABLE(MAC_JAVA_BRIDGE)
 
 #import <Foundation/Foundation.h>
-#import "jni_utility.h"
-#import "jni_utility_private.h"
+#import "JNIUtility.h"
+#import "JNIUtilityPrivate.h"
 #import "objc_utility.h"
 #include <runtime/JSLock.h>
 
diff --git a/WebCore/bridge/jni/jni_runtime.cpp b/WebCore/bridge/jni/jni_runtime.cpp
index 3624ba5..2f5ba19 100644
--- a/WebCore/bridge/jni/jni_runtime.cpp
+++ b/WebCore/bridge/jni/jni_runtime.cpp
@@ -29,9 +29,9 @@
 #if ENABLE(MAC_JAVA_BRIDGE)
 
 #include "CString.h"
+#include "JNIUtility.h"
+#include "JNIUtilityPrivate.h"
 #include "StringBuilder.h"
-#include "jni_utility.h"
-#include "jni_utility_private.h"
 #include "runtime_array.h"
 #include "runtime_object.h"
 #include "runtime_root.h"
diff --git a/WebCore/bridge/jni/jni_runtime.h b/WebCore/bridge/jni/jni_runtime.h
index 5c0dc66..d0a9753 100644
--- a/WebCore/bridge/jni/jni_runtime.h
+++ b/WebCore/bridge/jni/jni_runtime.h
@@ -28,8 +28,8 @@
 
 #if ENABLE(MAC_JAVA_BRIDGE)
 
+#include "JNIUtility.h"
 #include "JavaInstanceJSC.h"
-#include "jni_utility.h"
 
 #if USE(JSC)
 #include "JavaStringJSC.h"
diff --git a/WebCore/bridge/jni/jsc/jni_utility_private.cpp b/WebCore/bridge/jni/jsc/JNIUtilityPrivate.cpp
index 7f8afd5..424c9d2 100644
--- a/WebCore/bridge/jni/jsc/jni_utility_private.cpp
+++ b/WebCore/bridge/jni/jsc/JNIUtilityPrivate.cpp
@@ -25,7 +25,7 @@
  */
 
 #include "config.h"
-#include "jni_utility_private.h"
+#include "JNIUtilityPrivate.h"
 
 #if ENABLE(MAC_JAVA_BRIDGE)
 
@@ -189,7 +189,7 @@ jvalue convertValueToJValue(ExecState* exec, JSValue value, JNIType jniType, con
                     if (instance)
                         result.l = instance->javaInstance();
                 } else if (objectImp->classInfo() == &RuntimeArray::s_info) {
-                // Input is a JavaScript Array that was originally created from a Java Array
+                    // Input is a JavaScript Array that was originally created from a Java Array
                     RuntimeArray* imp = static_cast<RuntimeArray*>(objectImp);
                     JavaArray* array = static_cast<JavaArray*>(imp->getConcreteArray());
                     result.l = array->javaArray();
@@ -284,7 +284,7 @@ jvalue convertValueToJValue(ExecState* exec, JSValue value, JNIType jniType, con
     return result;
 }
 
-}  // end of namespace Bindings
+} // end of namespace Bindings
 
 } // end of namespace JSC
 
diff --git a/WebCore/bridge/jni/jsc/jni_utility_private.h b/WebCore/bridge/jni/jsc/JNIUtilityPrivate.h
index 647852e..0297f97 100644
--- a/WebCore/bridge/jni/jsc/jni_utility_private.h
+++ b/WebCore/bridge/jni/jsc/JNIUtilityPrivate.h
@@ -24,12 +24,12 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _JNI_UTILITY_PRIVATE_H_
-#define _JNI_UTILITY_PRIVATE_H_
+#ifndef JNIUtilityPrivate_h
+#define JNIUtilityPrivate_h
 
 #if ENABLE(MAC_JAVA_BRIDGE)
 
-#include "jni_utility.h"
+#include "JNIUtility.h"
 #include <runtime/JSValue.h>
 
 namespace JSC {
@@ -48,4 +48,4 @@ bool dispatchJNICall(ExecState*, const void* targetAppletView, jobject obj, bool
 
 #endif // ENABLE(MAC_JAVA_BRIDGE)
 
-#endif // _JNI_UTILITY_H_
+#endif // JNIUtilityPrivate_h
diff --git a/WebCore/bridge/jni/jsc/JavaClassJSC.cpp b/WebCore/bridge/jni/jsc/JavaClassJSC.cpp
index c003255..2c88314 100644
--- a/WebCore/bridge/jni/jsc/JavaClassJSC.cpp
+++ b/WebCore/bridge/jni/jsc/JavaClassJSC.cpp
@@ -28,9 +28,9 @@
 
 #if ENABLE(MAC_JAVA_BRIDGE)
 
+#include "JNIUtility.h"
 #include "JSDOMWindow.h"
 #include "jni_runtime.h"
-#include "jni_utility.h"
 #include <runtime/Identifier.h>
 #include <runtime/JSLock.h>
 
diff --git a/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp b/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp
index 17e0147..60db151 100644
--- a/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp
+++ b/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp
@@ -28,10 +28,10 @@
 
 #if ENABLE(MAC_JAVA_BRIDGE)
 
+#include "JNIUtility.h"
+#include "JNIUtilityPrivate.h"
 #include "JavaClassJSC.h"
 #include "jni_runtime.h"
-#include "jni_utility.h"
-#include "jni_utility_private.h"
 #include "runtime_object.h"
 #include "runtime_root.h"
 #include <runtime/ArgList.h>
diff --git a/WebCore/bridge/jni/jsc/JavaStringJSC.h b/WebCore/bridge/jni/jsc/JavaStringJSC.h
index d3ed56b..720f887 100644
--- a/WebCore/bridge/jni/jsc/JavaStringJSC.h
+++ b/WebCore/bridge/jni/jsc/JavaStringJSC.h
@@ -26,8 +26,8 @@
 #ifndef JavaStringJSC_h
 #define JavaStringJSC_h
 
+#include "JNIUtility.h"
 #include "JavaInstanceJSC.h"
-#include "jni_utility.h"
 #include <runtime/JSLock.h>
 
 
diff --git a/WebCore/bridge/jni/v8/jni_utility_private.h b/WebCore/bridge/jni/v8/jni_utility_private.h
index 397de7b..344e63c 100644
--- a/WebCore/bridge/jni/v8/jni_utility_private.h
+++ b/WebCore/bridge/jni/v8/jni_utility_private.h
@@ -26,7 +26,7 @@
 #ifndef _JNI_UTILITY_PRIVATE_H_
 #define _JNI_UTILITY_PRIVATE_H_
 
-#include "jni_utility.h"
+#include "JNIUtility.h"
 #include "npruntime.h"
 
 namespace JSC {