Fixup webkit for WebViewClassic rename

Changes native method bindings from API classes WebView and WebSettings, to
the corresponding implementation classes WebViewClassic and WebSettingsClassic

Interdepends on https://android-git.corp.google.com/g/165608

Change-Id: Ie47e5c8453fabef2afae399f411ffbe047cbfaab

4 files changed, 12 insertions, 12 deletions

diff --git a/Source/WebKit/android/jni/WebCoreJniOnLoad.cpp b/Source/WebKit/android/jni/WebCoreJniOnLoad.cpp
index 2644dab..ec052f1 100644
--- a/Source/WebKit/android/jni/WebCoreJniOnLoad.cpp
+++ b/Source/WebKit/android/jni/WebCoreJniOnLoad.cpp
@@ -106,7 +106,7 @@ static RegistrationMethod gWebCoreRegMethods[] = {
     { "WebViewCore", android::registerWebViewCore },
     { "WebHistory", android::registerWebHistory },
     { "WebIconDatabase", android::registerWebIconDatabase },
-    { "WebSettings", android::registerWebSettings },
+    { "WebSettingsClassic", android::registerWebSettings },
 #if ENABLE(DATABASE)
     { "WebStorage", android::registerWebStorage },
 #endif
diff --git a/Source/WebKit/android/jni/WebSettings.cpp b/Source/WebKit/android/jni/WebSettings.cpp
index 59ade52..65ac360 100644
--- a/Source/WebKit/android/jni/WebSettings.cpp
+++ b/Source/WebKit/android/jni/WebSettings.cpp
@@ -130,8 +130,8 @@ struct FieldIds {
         mPageCacheCapacity = env->GetFieldID(clazz, "mPageCacheCapacity", "I");
 #if ENABLE(WEB_AUTOFILL)
         mAutoFillEnabled = env->GetFieldID(clazz, "mAutoFillEnabled", "Z");
-        mAutoFillProfile = env->GetFieldID(clazz, "mAutoFillProfile", "Landroid/webkit/WebSettings$AutoFillProfile;");
-        jclass autoFillProfileClass = env->FindClass("android/webkit/WebSettings$AutoFillProfile");
+        mAutoFillProfile = env->GetFieldID(clazz, "mAutoFillProfile", "Landroid/webkit/WebSettingsClassic$AutoFillProfile;");
+        jclass autoFillProfileClass = env->FindClass("android/webkit/WebSettingsClassic$AutoFillProfile");
         mAutoFillProfileFullName = env->GetFieldID(autoFillProfileClass, "mFullName", "Ljava/lang/String;");
         mAutoFillProfileEmailAddress = env->GetFieldID(autoFillProfileClass, "mEmailAddress", "Ljava/lang/String;");
         mAutoFillProfileCompanyName = env->GetFieldID(autoFillProfileClass, "mCompanyName", "Ljava/lang/String;");
@@ -601,11 +601,11 @@ static JNINativeMethod gWebSettingsMethods[] = {
 
 int registerWebSettings(JNIEnv* env)
 {
-    jclass clazz = env->FindClass("android/webkit/WebSettings");
-    ALOG_ASSERT(clazz, "Unable to find class WebSettings!");
+    jclass clazz = env->FindClass("android/webkit/WebSettingsClassic");
+    ALOG_ASSERT(clazz, "Unable to find class WebSettingsClassic!");
     gFieldIds = new FieldIds(env, clazz);
     env->DeleteLocalRef(clazz);
-    return jniRegisterNativeMethods(env, "android/webkit/WebSettings",
+    return jniRegisterNativeMethods(env, "android/webkit/WebSettingsClassic",
             gWebSettingsMethods, NELEM(gWebSettingsMethods));
 }
 
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index 443f2ca..c3937bc 100644
--- a/Source/WebKit/android/jni/WebViewCore.cpp
+++ b/Source/WebKit/android/jni/WebViewCore.cpp
@@ -5063,7 +5063,7 @@ int registerWebViewCore(JNIEnv* env)
     ALOG_ASSERT(gWebViewCoreFields.m_viewportDensityDpi,
             "Unable to find android/webkit/WebViewCore.mViewportDensityDpi");
     gWebViewCoreFields.m_webView = env->GetFieldID(widget,
-            "mWebView", "Landroid/webkit/WebView;");
+            "mWebView", "Landroid/webkit/WebViewClassic;");
     ALOG_ASSERT(gWebViewCoreFields.m_webView,
             "Unable to find android/webkit/WebViewCore.mWebView");
     gWebViewCoreFields.m_drawIsPaused = env->GetFieldID(widget,
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp
index 7aae9b2..5924d5e 100644
--- a/Source/WebKit/android/nav/WebView.cpp
+++ b/Source/WebKit/android/nav/WebView.cpp
@@ -145,7 +145,7 @@ WebView(JNIEnv* env, jobject javaWebView, int viewImpl, WTF::String drawableDir,
     : m_isHighEndGfx(isHighEndGfx)
 {
     memset(m_extras, 0, DRAW_EXTRAS_SIZE * sizeof(DrawExtra*));
-    jclass clazz = env->FindClass("android/webkit/WebView");
+    jclass clazz = env->FindClass("android/webkit/WebViewClassic");
  //   m_javaGlue = new JavaGlue;
     m_javaGlue.m_obj = env->NewWeakGlobalRef(javaWebView);
     m_javaGlue.m_scrollBy = GetJMethod(env, clazz, "setContentScrollBy", "(IIZ)Z");
@@ -1759,13 +1759,13 @@ static JNINativeMethod gJavaWebViewMethods[] = {
 
 int registerWebView(JNIEnv* env)
 {
-    jclass clazz = env->FindClass("android/webkit/WebView");
-    ALOG_ASSERT(clazz, "Unable to find class android/webkit/WebView");
+    jclass clazz = env->FindClass("android/webkit/WebViewClassic");
+    ALOG_ASSERT(clazz, "Unable to find class android/webkit/WebViewClassic");
     gWebViewField = env->GetFieldID(clazz, "mNativeClass", "I");
-    ALOG_ASSERT(gWebViewField, "Unable to find android/webkit/WebView.mNativeClass");
+    ALOG_ASSERT(gWebViewField, "Unable to find android/webkit/WebViewClassic.mNativeClass");
     env->DeleteLocalRef(clazz);
 
-    return jniRegisterNativeMethods(env, "android/webkit/WebView", gJavaWebViewMethods, NELEM(gJavaWebViewMethods));
+    return jniRegisterNativeMethods(env, "android/webkit/WebViewClassic", gJavaWebViewMethods, NELEM(gJavaWebViewMethods));
 }
 
 } // namespace android