Fix some include guards in Android files

This will become relevant after we merge beyond
http://trac.webkit.org/changeset/81977 (and its follow-up build fixes
r81982, r81988, r81990, r82018) which relies on all platforms'
instances of FontPlatformData.h using the correct include guard.

Change-Id: I58ec4c8ee23698c41d86794333d603b95f303764

10 files changed, 24 insertions, 24 deletions

diff --git a/Source/WebKit/android/jni/JavaSharedClient.h b/Source/WebKit/android/jni/JavaSharedClient.h
index 9a09280..b432b31 100644
--- a/Source/WebKit/android/jni/JavaSharedClient.h
+++ b/Source/WebKit/android/jni/JavaSharedClient.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef JAVA_SHARED_CLIENT_H
-#define JAVA_SHARED_CLIENT_H
+#ifndef JavaSharedClient_h
+#define JavaSharedClient_h
 
 namespace android {
 
diff --git a/Source/WebKit/android/jni/PictureSet.h b/Source/WebKit/android/jni/PictureSet.h
index b04337c..647d177 100644
--- a/Source/WebKit/android/jni/PictureSet.h
+++ b/Source/WebKit/android/jni/PictureSet.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef PICTURESET_H
-#define PICTURESET_H
+#ifndef PictureSet_h
+#define PictureSet_h
 
 #define PICTURE_SET_DUMP 0
 #define PICTURE_SET_DEBUG 0
diff --git a/Source/WebKit/android/jni/WebCoreFrameBridge.h b/Source/WebKit/android/jni/WebCoreFrameBridge.h
index 6522a5f..2e2468c 100644
--- a/Source/WebKit/android/jni/WebCoreFrameBridge.h
+++ b/Source/WebKit/android/jni/WebCoreFrameBridge.h
@@ -25,8 +25,8 @@
 
 // TODO: change name to WebFrame.h
 
-#ifndef WEBFRAME_H
-#define WEBFRAME_H
+#ifndef WebCoreFrameBridge_h
+#define WebCoreFrameBridge_h
 
 #include "FrameLoaderClient.h"
 #include "PlatformBridge.h"
@@ -170,4 +170,4 @@ private:
 
 }   // namespace android
 
-#endif // WEBFRAME_H
+#endif // WebCoreFrameBridge_h
diff --git a/Source/WebKit/android/jni/WebCoreJni.h b/Source/WebKit/android/jni/WebCoreJni.h
index ec25c8f..0f77cc6 100644
--- a/Source/WebKit/android/jni/WebCoreJni.h
+++ b/Source/WebKit/android/jni/WebCoreJni.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef ANDROID_WEBKIT_WEBCOREJNI_H
-#define ANDROID_WEBKIT_WEBCOREJNI_H
+#ifndef WebCoreJni_h
+#define WebCoreJni_h
 
 #include "ChromiumIncludes.h"
 #include "PlatformString.h"
diff --git a/Source/WebKit/android/jni/WebCoreResourceLoader.h b/Source/WebKit/android/jni/WebCoreResourceLoader.h
index c60b3f5..0e34a5b 100644
--- a/Source/WebKit/android/jni/WebCoreResourceLoader.h
+++ b/Source/WebKit/android/jni/WebCoreResourceLoader.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef ANDROID_WEBKIT_RESOURCELOADLISTENER_H
-#define ANDROID_WEBKIT_RESOURCELOADLISTENER_H
+#ifndef WebCoreResourceLoader_h
+#define WebCoreResourceLoader_h
 
 #include <KURL.h>
 #include <ResourceLoaderAndroid.h>
diff --git a/Source/WebKit/android/jni/WebCoreViewBridge.h b/Source/WebKit/android/jni/WebCoreViewBridge.h
index 59e1c9a..f247602 100644
--- a/Source/WebKit/android/jni/WebCoreViewBridge.h
+++ b/Source/WebKit/android/jni/WebCoreViewBridge.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WEBCORE_VIEW_BRIDGE_H
-#define WEBCORE_VIEW_BRIDGE_H
+#ifndef WebCoreViewBridge_h
+#define WebCoreViewBridge_h
 
 // TODO: move this outside of jni directory
 
@@ -103,4 +103,4 @@ private:
     WebCore::IntRect    m_visibleBounds;
 };
 
-#endif // WEBCORE_VIEW_BRIDGE_H
+#endif // WebCoreViewBridge_h
diff --git a/Source/WebKit/android/jni/WebFrameView.h b/Source/WebKit/android/jni/WebFrameView.h
index 823f2b4..117b603 100644
--- a/Source/WebKit/android/jni/WebFrameView.h
+++ b/Source/WebKit/android/jni/WebFrameView.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WEB_FRAMEVIEW_H
-#define WEB_FRAMEVIEW_H
+#ifndef WebFrameView_h
+#define WebFrameView_h
 
 #include "WebCoreViewBridge.h"
 
@@ -62,4 +62,4 @@ namespace android {
 
 } // namespace android
 
-#endif // WEB_FRAMEVIEW_H
+#endif // WebFrameView_h
diff --git a/Source/WebKit/android/jni/WebHistory.h b/Source/WebKit/android/jni/WebHistory.h
index 2d86aa4..fc0b340 100644
--- a/Source/WebKit/android/jni/WebHistory.h
+++ b/Source/WebKit/android/jni/WebHistory.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef ANDROID_WEBKIT_WEBHISTORY_H
-#define ANDROID_WEBKIT_WEBHISTORY_H
+#ifndef WebHistory_h
+#define WebHistory_h
 
 #include "AndroidWebHistoryBridge.h"
 
diff --git a/Source/WebKit/android/jni/WebIconDatabase.h b/Source/WebKit/android/jni/WebIconDatabase.h
index b2169aa..f3bb244 100644
--- a/Source/WebKit/android/jni/WebIconDatabase.h
+++ b/Source/WebKit/android/jni/WebIconDatabase.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef ANDROID_WEBKIT_WEBICONDATABASE_H
-#define ANDROID_WEBKIT_WEBICONDATABASE_H
+#ifndef WebIconDatabase_h
+#define WebIconDatabase_h
 
 #include "IconDatabaseClient.h"
 #include "PlatformString.h"
diff --git a/Source/WebKit/android/jni/WebViewCore.h b/Source/WebKit/android/jni/WebViewCore.h
index 0dd45da..877f716 100644
--- a/Source/WebKit/android/jni/WebViewCore.h
+++ b/Source/WebKit/android/jni/WebViewCore.h
@@ -23,8 +23,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef WEBVIEWCORE_H
-#define WEBVIEWCORE_H
+#ifndef WebViewCore_h
+#define WebViewCore_h
 
 #include "CacheBuilder.h"
 #include "CachedHistory.h"
@@ -715,4 +715,4 @@ namespace android {
 
 }   // namespace android
 
-#endif // WEBVIEWCORE_H
+#endif // WebViewCore_h