Merge autofill files after last Chromium merge

Merge by hand the files that have been gotked implementing
AutoFill on Android. This classes use WebCore types rather
than the Chrome WebKit API types that the code would
normally use.

This brings the files up to date with the last external/chromium
merge to r63472 and updates their usages in line with that so
that the feature continues to work as intended.

Change-Id: Ic110873dc48c59555f0db76e7ad0c138c2fe96f2

2 files changed, 2 insertions, 2 deletions

diff --git a/WebKit/android/jni/WebCoreFrameBridge.cpp b/WebKit/android/jni/WebCoreFrameBridge.cpp
index e4f942d..9f818ce 100644
--- a/WebKit/android/jni/WebCoreFrameBridge.cpp
+++ b/WebKit/android/jni/WebCoreFrameBridge.cpp
@@ -668,7 +668,7 @@ WebFrame::didFinishLoad(WebCore::Frame* frame)
     // TODO: Need to consider child frames.
     if (isMainFrame) {
         EditorClientAndroid* editorClient = static_cast<EditorClientAndroid*>(mPage->editorClient());
-        editorClient->getAutoFill()->searchDocument(frame->document());
+        editorClient->getAutoFill()->searchDocument(frame);
     }
 #endif
 }
diff --git a/WebKit/android/jni/WebSettings.cpp b/WebKit/android/jni/WebSettings.cpp
index fc9d628..f855307 100644
--- a/WebKit/android/jni/WebSettings.cpp
+++ b/WebKit/android/jni/WebSettings.cpp
@@ -513,7 +513,7 @@ public:
         EditorClientAndroid* editorC = static_cast<EditorClientAndroid*>(pFrame->page()->editorClient());
         WebAutoFill* webAutoFill = editorC->getAutoFill();
         if (!oldAutoFillSetting && flag)
-            webAutoFill->searchDocument(pFrame->document());
+            webAutoFill->searchDocument(pFrame);
 
         // Set the active AutoFillProfile data.
         jobject autoFillProfile = env->GetObjectField(obj, gFieldIds->mAutoFillProfile);