Merge Chromium at r11.0.672.0: Fix autofill

Major refactoring in CL:
http://codereview.chromium.org/5958021

Created wrapper function to call in chromium CL:
https://android-git.corp.google.com/g/#change,113980

Change-Id: I637b26fb2e3ccb544adfc818b94047ef5a2c5aad

diff --git a/Source/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp b/Source/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp
index a80636c..961497b 100644 (file)
--- a/Source/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp
+++ b/Source/WebKit/android/WebCoreSupport/autofill/WebAutoFill.cpp
@@ -122,7 +122,7 @@ void WebAutoFill::searchDocument(WebCore::Frame* frame)
 void WebAutoFill::formsSeenImpl()
 {
     MutexLocker lock(mFormsSeenMutex);
-    mAutoFillManager->FormsSeen(mForms);
+    mAutoFillManager->OnFormsSeenWrapper(mForms);
     mParsingForms = false;
     mFormsSeenCondition.signal();
 }
@@ -166,7 +166,7 @@ void WebAutoFill::formFieldFocused(WebCore::HTMLFormControlElement* formFieldEle
     mFormManager->FindFormWithFormControlElement(formFieldElement, FormManager::REQUIRE_AUTOCOMPLETE, form);
     mQueryMap[mQueryId] = new FormDataAndField(form, formField);
 
-    bool suggestions = mAutoFillManager->GetAutoFillSuggestions(*form, *formField);
+    bool suggestions = mAutoFillManager->OnQueryFormFieldAutoFillWrapper(0, *form, *formField); // First param not used on Android
 
     mQueryId++;
     if (!suggestions) {
@@ -207,7 +207,7 @@ void WebAutoFill::fillFormFields(int queryId)
         // but stop here to be certain.
         return;
     }
-    mAutoFillManager->FillAutoFillFormData(queryId, *form, *field, iter->second);
+    mAutoFillManager->OnFillAutoFillFormDataWrapper(queryId, *form, *field, iter->second);
     mUniqueIdMap.erase(iter);
 }