From 492bcfac9fc25b61f44811050fb0cfe827eb6a08 Mon Sep 17 00:00:00 2001
From: Jonathan Dixon <joth@google.com>
Date: Thu, 12 Apr 2012 21:47:49 +0100
Subject: Fix up webkit to reflect Java class renames

GeolocationPermissionsClassic
CookieManagerClassic
WebIconDatabaseClassic
WebStorageClassic

Change-Id: I3fb125ea286db55c906d80e322b06060464a8bff
---
 Source/WebKit/android/jni/CookieManager.cpp                | 4 ++--
 Source/WebKit/android/jni/GeolocationPermissionsBridge.cpp | 2 +-
 Source/WebKit/android/jni/WebIconDatabase.cpp              | 6 +++---
 Source/WebKit/android/jni/WebStorage.cpp                   | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Source/WebKit/android/jni/CookieManager.cpp b/Source/WebKit/android/jni/CookieManager.cpp
index fca612f..5db1e16 100644
--- a/Source/WebKit/android/jni/CookieManager.cpp
+++ b/Source/WebKit/android/jni/CookieManager.cpp
@@ -35,8 +35,8 @@ using namespace net;
 
 namespace android {
 
-// JNI for android.webkit.CookieManager
-static const char* javaCookieManagerClass = "android/webkit/CookieManager";
+// JNI for android.webkit.CookieManagerClassic
+static const char* javaCookieManagerClass = "android/webkit/CookieManagerClassic";
 
 static bool acceptCookie(JNIEnv*, jobject)
 {
diff --git a/Source/WebKit/android/jni/GeolocationPermissionsBridge.cpp b/Source/WebKit/android/jni/GeolocationPermissionsBridge.cpp
index 2c1db3f..295b347 100755
--- a/Source/WebKit/android/jni/GeolocationPermissionsBridge.cpp
+++ b/Source/WebKit/android/jni/GeolocationPermissionsBridge.cpp
@@ -99,7 +99,7 @@ static JNINativeMethod gGeolocationPermissionsMethods[] = {
 
 int registerGeolocationPermissions(JNIEnv* env)
 {
-    const char* kGeolocationPermissionsClass = "android/webkit/GeolocationPermissions";
+    const char* kGeolocationPermissionsClass = "android/webkit/GeolocationPermissionsClassic";
 #ifndef NDEBUG
     jclass geolocationPermissions = env->FindClass(kGeolocationPermissionsClass);
     ALOG_ASSERT(geolocationPermissions, "Unable to find class");
diff --git a/Source/WebKit/android/jni/WebIconDatabase.cpp b/Source/WebKit/android/jni/WebIconDatabase.cpp
index 3d988e9..c53db0e 100644
--- a/Source/WebKit/android/jni/WebIconDatabase.cpp
+++ b/Source/WebKit/android/jni/WebIconDatabase.cpp
@@ -255,12 +255,12 @@ static JNINativeMethod gWebIconDatabaseMethods[] = {
 int registerWebIconDatabase(JNIEnv* env)
 {
 #ifndef NDEBUG
-    jclass webIconDatabase = env->FindClass("android/webkit/WebIconDatabase");
-    ALOG_ASSERT(webIconDatabase, "Unable to find class android.webkit.WebIconDatabase");
+    jclass webIconDatabase = env->FindClass("android/webkit/WebIconDatabaseClassic");
+    ALOG_ASSERT(webIconDatabase, "Unable to find class android.webkit.WebIconDatabaseClassic");
     env->DeleteLocalRef(webIconDatabase);
 #endif
 
-    return jniRegisterNativeMethods(env, "android/webkit/WebIconDatabase",
+    return jniRegisterNativeMethods(env, "android/webkit/WebIconDatabaseClassic",
             gWebIconDatabaseMethods, NELEM(gWebIconDatabaseMethods));
 }
 
diff --git a/Source/WebKit/android/jni/WebStorage.cpp b/Source/WebKit/android/jni/WebStorage.cpp
index 9e9774d..66a3517 100644
--- a/Source/WebKit/android/jni/WebStorage.cpp
+++ b/Source/WebKit/android/jni/WebStorage.cpp
@@ -174,12 +174,12 @@ static JNINativeMethod gWebStorageMethods[] = {
 int registerWebStorage(JNIEnv* env)
 {
 #ifndef NDEBUG
-    jclass webStorage = env->FindClass("android/webkit/WebStorage");
-    ALOG_ASSERT(webStorage, "Unable to find class android.webkit.WebStorage");
+    jclass webStorage = env->FindClass("android/webkit/WebStorageClassic");
+    ALOG_ASSERT(webStorage, "Unable to find class android.webkit.WebStorageClassic");
     env->DeleteLocalRef(webStorage);
 #endif
 
-    return jniRegisterNativeMethods(env, "android/webkit/WebStorage",
+    return jniRegisterNativeMethods(env, "android/webkit/WebStorageClassic",
             gWebStorageMethods, NELEM(gWebStorageMethods));
 }
 
-- 
cgit v1.1