Index: components/autofill/core/browser/autofill_manager.cc |
diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc |
index f346849ee94073dbdd73c2280ba185af6ff1ce2b..eb9e8cd7046737dbab74aecfe5ef3e28c695e8d4 100644 |
--- a/components/autofill/core/browser/autofill_manager.cc |
+++ b/components/autofill/core/browser/autofill_manager.cc |
@@ -44,6 +44,7 @@ |
#include "components/autofill/core/browser/phone_number.h" |
#include "components/autofill/core/browser/phone_number_i18n.h" |
#include "components/autofill/core/browser/popup_item_ids.h" |
+#include "components/autofill/core/common/autofill_constants.h" |
#include "components/autofill/core/common/autofill_data_validation.h" |
#include "components/autofill/core/common/autofill_pref_names.h" |
#include "components/autofill/core/common/autofill_switches.h" |
@@ -386,8 +387,8 @@ void AutofillManager::OnQueryFormFieldAutofill(int query_id, |
AutofillField* autofill_field = NULL; |
bool got_autofillable_form = |
GetCachedFormAndField(form, field, &form_structure, &autofill_field) && |
- // Don't send suggestions or track forms that aren't auto-fillable. |
- form_structure->IsAutofillable(); |
+ // Don't send suggestions or track forms that should not be parsed. |
+ form_structure->ShouldBeParsed(); |
// Logging interactions of forms that are autofillable. |
if (got_autofillable_form) { |
@@ -1400,6 +1401,8 @@ void AutofillManager::ParseForms(const std::vector<FormData>& forms) { |
for (const FormData& form : forms) { |
scoped_ptr<FormStructure> form_structure(new FormStructure(form)); |
+ form_structure->ParseFieldTypesFromAutocompleteAttributes(); |
+ |
if (!form_structure->ShouldBeParsed()) { |
if (form_structure->has_password_field()) { |
AutofillMetrics::LogPasswordFormQueryVolume( |
@@ -1521,7 +1524,8 @@ bool AutofillManager::ShouldUploadForm(const FormStructure& form) { |
return false; |
// Disregard forms that we wouldn't ever autofill in the first place. |
- if (!form.ShouldBeParsed()) |
+ if (!form.ShouldBeParsed() && |
+ form.active_field_count() >= kRequiredAutofillFields) |
Mathieu
2015/10/20 21:03:10
reverse and add comment on why it's redundant
sebsg
2015/10/21 18:20:50
Done.
|
return false; |
return true; |