[Autofill] Always show available data when encountering autocomplete attributes

components/autofill/core/browser/autofill_manager.cc

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 94049ff0729ae84a3a7cbdb5ffd41a22cbebdb68..b48ddd832049526f685de3ee125897f4a3ebdc1d 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) {
@@ -810,7 +811,11 @@ bool AutofillManager::ShouldUploadForm(const FormStructure& form) {
     return false;
 
   // Disregard forms that we wouldn't ever autofill in the first place.
-  if (!form.ShouldBeParsed())
+  // ShouldBeParsed can return true for small forms in certain situations so a
+  // specific check for the number of active fields is necessary to avoid
+  // uploading very small forms.
+  if (!form.ShouldBeParsed() ||
+      form.active_field_count() < kRequiredAutofillFields)

[Evan Stade, 2015/11/04 17:15:19]

kRequiredAutofillFields needs updating (its comment as well as its name)

[Evan Stade, 2015/11/04 17:15:19]

nit: Curlies

[sebsg, 2015/11/10 19:04:51]

Done.

[sebsg, 2015/11/10 19:04:51]

Done.

     return false;
 
   return true;
@@ -1360,6 +1365,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(