11 files changed, 43 insertions, 51 deletions
diff --git a/WebKit/android/jni/JavaBridge.cpp b/WebKit/android/jni/JavaBridge.cpp
index 9e83d6a..feca297 100644
--- a/WebKit/android/jni/JavaBridge.cpp
+++ b/WebKit/android/jni/JavaBridge.cpp
@@ -25,9 +25,7 @@
 
 #define LOG_TAG "webcoreglue"
 
-#include <config.h>
-#include <wtf/Platform.h>
-#include <wtf/StdLibExtras.h>
+#include "config.h"
 
 #include "AtomicString.h"
 #include "Cache.h"
@@ -42,17 +40,18 @@
 #include "PluginDatabase.h"
 #include "Timer.h"
 #include "TimerClient.h"
-#include "jni_utility.h"
-#include "WebCoreJni.h"
-
 #ifdef ANDROID_INSTRUMENT
 #include "TimeCounter.h"
 #endif
+#include "WebCoreJni.h"
 
-#include <jni.h>
 #include <JNIHelp.h>
+#include <JNIUtility.h>
 #include <SkUtils.h>
+#include <jni.h>
 #include <utils/misc.h>
+#include <wtf/Platform.h>
+#include <wtf/StdLibExtras.h>
 
 namespace android {
 
diff --git a/WebKit/android/jni/MIMETypeRegistry.cpp b/WebKit/android/jni/MIMETypeRegistry.cpp
index b85b4a5..eec7af6 100644
--- a/WebKit/android/jni/MIMETypeRegistry.cpp
+++ b/WebKit/android/jni/MIMETypeRegistry.cpp
@@ -26,12 +26,12 @@
 #define LOG_TAG "WebCore"
 
 #include "config.h"
-
 #include "MIMETypeRegistry.h"
+
 #include "PlatformString.h"
-#include "jni_utility.h"
 #include "WebCoreJni.h"
 
+#include <JNIUtility.h>
 #include <jni.h>
 #include <utils/Log.h>
 
diff --git a/WebKit/android/jni/MockGeolocation.cpp b/WebKit/android/jni/MockGeolocation.cpp
index e76b1c1..df580c3 100755
--- a/WebKit/android/jni/MockGeolocation.cpp
+++ b/WebKit/android/jni/MockGeolocation.cpp
@@ -28,14 +28,14 @@
 
 #include "config.h"
 
-#include <JNIHelp.h>
 #include "Coordinates.h"
 #include "GeolocationServiceMock.h"
 #include "Geoposition.h"
 #include "JavaSharedClient.h"
-#include "jni_utility.h"
 #include "PositionError.h"
 #include "WebCoreJni.h"
+#include <JNIHelp.h>
+#include <JNIUtility.h>
 #include <wtf/CurrentTime.h>
 
 using namespace WebCore;
diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index 9e1888d..d807808 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -25,7 +25,7 @@
 
 #define LOG_TAG "webcoreglue"
 
-#include <config.h>
+#include "config.h"
 
 #include <wtf/Platform.h>
 #include <wtf/CurrentTime.h>
@@ -99,7 +99,7 @@
 #include <runtime_object.h>
 #endif  // USE(JSC)
 
-#include <jni_utility.h>
+#include <JNIUtility.h>
 #include "jni.h"
 
 #if USE(JSC)
diff --git a/WebKit/android/jni/WebCoreJni.cpp b/WebKit/android/jni/WebCoreJni.cpp
index ef33cc0..73acb7b 100644
--- a/WebKit/android/jni/WebCoreJni.cpp
+++ b/WebKit/android/jni/WebCoreJni.cpp
@@ -26,10 +26,10 @@
 #define LOG_TAG "webcoreglue"
 
 #include "config.h"
+#include "WebCoreJni.h"
 
 #include "NotImplemented.h"
-#include "WebCoreJni.h"
-#include "jni_utility.h"
+#include <JNIUtility.h>
 #include <jni.h>
 #include <utils/Log.h>
 
diff --git a/WebKit/android/jni/WebCoreJniOnLoad.cpp b/WebKit/android/jni/WebCoreJniOnLoad.cpp
index 2716a7e..b5bf9dd 100644
--- a/WebKit/android/jni/WebCoreJniOnLoad.cpp
+++ b/WebKit/android/jni/WebCoreJniOnLoad.cpp
@@ -42,7 +42,6 @@
 #include "InspectorClientAndroid.h"
 #include "IntRect.h"
 #include "JavaSharedClient.h"
-#include "jni_utility.h"
 #include "Page.h"
 #include "PlatformGraphicsContext.h"
 #include "ResourceRequest.h"
@@ -51,21 +50,19 @@
 #include "SelectionController.h"
 #include "Settings.h"
 #include "SharedBuffer.h"
+#include "SkBitmap.h"
+#include "SkCanvas.h"
+#include "SkImageEncoder.h"
 #include "SubstituteData.h"
 #include "TimerClient.h"
 #include "TextEncoding.h"
 #include "WebCoreViewBridge.h"
 #include "WebFrameView.h"
 #include "WebViewCore.h"
-
-#include "SkBitmap.h"
-#include "SkCanvas.h"
-#include "SkImageEncoder.h"
-
 #include "benchmark/Intercept.h"
 #include "benchmark/MyJavaVM.h"
 
-#include "jni_utility.h"
+#include <JNIUtility.h>
 #include <jni.h>
 #include <utils/Log.h>
 
diff --git a/WebKit/android/jni/WebCoreResourceLoader.cpp b/WebKit/android/jni/WebCoreResourceLoader.cpp
index 55af52d..b17c9a7 100644
--- a/WebKit/android/jni/WebCoreResourceLoader.cpp
+++ b/WebKit/android/jni/WebCoreResourceLoader.cpp
@@ -25,12 +25,8 @@
 
 #define LOG_TAG "webcoreglue"
 
-#include <config.h>
-#include <wtf/Platform.h>
-
-#include "jni_utility.h"
+#include "config.h"
 #include "WebCoreResourceLoader.h"
-#include "SkUtils.h"
 
 #include "CString.h"
 #include "ResourceError.h"
@@ -38,16 +34,18 @@
 #include "ResourceHandleClient.h"
 #include "ResourceHandleInternal.h"
 #include "ResourceResponse.h"
-#include "WebCoreJni.h"
-
+#include "SkUtils.h"
 #ifdef ANDROID_INSTRUMENT
 #include "TimeCounter.h"
 #endif
+#include "WebCoreJni.h"
 
-#include <utils/misc.h>
 #include <JNIHelp.h>
+#include <JNIUtility.h>
 #include <SkTypes.h>
 #include <stdlib.h>
+#include <utils/misc.h>
+#include <wtf/Platform.h>
 
 namespace android {
   
diff --git a/WebKit/android/jni/WebHistory.cpp b/WebKit/android/jni/WebHistory.cpp
index 76a310b..f5a0b63 100644
--- a/WebKit/android/jni/WebHistory.cpp
+++ b/WebKit/android/jni/WebHistory.cpp
@@ -25,10 +25,7 @@
 
 #define LOG_TAG "webhistory"
 
-#include <config.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/Platform.h>
-
+#include "config.h"
 #include "WebHistory.h"
 
 #include "BackForwardList.h"
@@ -45,11 +42,13 @@
 #include "WebCoreFrameBridge.h"
 #include "WebCoreJni.h"
 #include "WebIconDatabase.h"
-#include "jni_utility.h"
 
 #include <JNIHelp.h>
+#include "JNIUtility.h"
 #include <SkUtils.h>
 #include <utils/misc.h>
+#include <wtf/OwnPtr.h>
+#include <wtf/Platform.h>
 
 namespace android {
 
diff --git a/WebKit/android/jni/WebIconDatabase.cpp b/WebKit/android/jni/WebIconDatabase.cpp
index 20258a4..840d161 100644
--- a/WebKit/android/jni/WebIconDatabase.cpp
+++ b/WebKit/android/jni/WebIconDatabase.cpp
@@ -25,26 +25,25 @@
 
 #define LOG_TAG "favicons"
 
-#include <config.h>
-#include <wtf/Platform.h>
-
+#include "config.h"
 #include "WebIconDatabase.h"
 
+#include "GraphicsJNI.h"
 #include "IconDatabase.h"
 #include "Image.h"
 #include "IntRect.h"
 #include "JavaSharedClient.h"
-#include "jni_utility.h"
 #include "KURL.h"
 #include "WebCoreJni.h"
 
-#include <pthread.h>
-#include "GraphicsJNI.h"
+#include <JNIHelp.h>
+#include <JNIUtility.h>
 #include <SkBitmap.h>
 #include <SkImageDecoder.h>
 #include <SkTemplates.h>
+#include <pthread.h>
 #include <utils/misc.h>
-#include <JNIHelp.h>
+#include <wtf/Platform.h>
 
 namespace android {
 
diff --git a/WebKit/android/jni/WebStorage.cpp b/WebKit/android/jni/WebStorage.cpp
index 07e4880..3ab16fd 100644
--- a/WebKit/android/jni/WebStorage.cpp
+++ b/WebKit/android/jni/WebStorage.cpp
@@ -27,17 +27,16 @@
 
 #if ENABLE(DATABASE)
 
-#include <JNIHelp.h>
+#include "JavaSharedClient.h"
+#include "KURL.h"
+#include "WebCoreJni.h"
 
+#include <JNIHelp.h>
+#include <JNIUtility.h>
 #include <WebCore/loader/appcache/ApplicationCacheStorage.h>
 #include <WebCore/page/SecurityOrigin.h>
 #include <WebCore/storage/DatabaseTracker.h>
 
-#include "JavaSharedClient.h"
-#include "jni_utility.h"
-#include "KURL.h"
-#include "WebCoreJni.h"
-
 namespace android {
 
 static jobject GetOrigins(JNIEnv* env, jobject obj)
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index 15cef2b..cb73fb1 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -25,7 +25,7 @@
 
 #define LOG_TAG "webcoreglue"
 
-#include <config.h>
+#include "config.h"
 #include "WebViewCore.h"
 
 #include "AtomicString.h"
@@ -65,7 +65,6 @@
 #include "HTMLSelectElement.h"
 #include "HTMLTextAreaElement.h"
 #include "InlineTextBox.h"
-#include <JNIHelp.h>
 #include "KeyboardCodes.h"
 #include "Navigator.h"
 #include "Node.h"
@@ -102,8 +101,10 @@
 #include "WebFrameView.h"
 #include "HistoryItem.h"
 #include "android_graphics.h"
+
+#include <JNIHelp.h>
+#include <JNIUtility.h>
 #include <ui/KeycodeLabels.h>
-#include "jni_utility.h"
 #include <wtf/CurrentTime.h>
 
 #if USE(V8)