Set datapresent string to contain precisely those field types available in stored Autofill data.

chrome/browser/autofill/autofill_manager.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/autofill/autofill_manager.h"
 
 #include <stddef.h>
 
 #include <limits>
 #include <map>
@@ skipping 39 matching lines @@
 using webkit_glue::FormData;
 using webkit_glue::FormField;
 
 namespace {
 
 // We only send a fraction of the forms to upload server.
 // The rate for positive/negative matches potentially could be different.
 const double kAutofillPositiveUploadRateDefaultValue = 0.20;
 const double kAutofillNegativeUploadRateDefaultValue = 0.20;
 
+const size_t kMaxRecentFormSignaturesToRemember = 3;
+
 const string16::value_type kCreditCardPrefix[] = {'*', 0};
 
 // Removes duplicate suggestions whilst preserving their original order.
 void RemoveDuplicateSuggestions(std::vector<string16>* values,
                                 std::vector<string16>* labels,
                                 std::vector<string16>* icons,
                                 std::vector<int>* unique_ids) {
   DCHECK_EQ(values->size(), labels->size());
   DCHECK_EQ(values->size(), icons->size());
   DCHECK_EQ(values->size(), unique_ids->size());
@@ skipping 484 matching lines @@
       } else {
         DCHECK_EQ(AutofillType::CREDIT_CARD, field_group_type);
         FillCreditCardFormField(credit_card, field_type, &result.fields[j]);
       }
     }
 
     // We found a matching field in the |form_structure| so we
     // proceed to the next |result| field, and the next |form_structure|.
     ++i;
   }
-  autofilled_forms_signatures_.push_front(form_structure->FormSignature());
+
+  autofilled_form_signatures_.push_front(form_structure->FormSignature());
+  // Only remember the last few forms that we've seen, both to avoid false
+  // positives and to avoid wasting memory.
+  if (autofilled_form_signatures_.size() > kMaxRecentFormSignaturesToRemember)
+    autofilled_form_signatures_.pop_back();
 
   host->Send(new AutofillMsg_FormDataFilled(
       host->routing_id(), query_id, result));
 }
 
 void AutofillManager::OnShowAutofillDialog() {
   Browser* browser = BrowserList::GetLastActive();
   if (browser)
     browser->ShowOptionsTab(chrome::kAutofillSubPage);
 }
@@ skipping 60 matching lines @@
   if (imported_credit_card && tab_contents()) {
     tab_contents()->AddInfoBar(
         new AutofillCCInfoBarDelegate(tab_contents(),
                                       scoped_credit_card.release(),
                                       personal_data_,
                                       metric_logger_.get()));
   }
 }
 
 void AutofillManager::UploadFormData(const FormStructure& submitted_form) {
-  if (!disable_download_manager_requests_) {
-    bool was_autofilled = false;
-    // Check if the form among last 3 forms that were auto-filled.
-    // Clear older signatures.
-    std::list<std::string>::iterator it;
-    int total_form_checked = 0;
-    for (it = autofilled_forms_signatures_.begin();
-         it != autofilled_forms_signatures_.end() && total_form_checked < 3;
-         ++it, ++total_form_checked) {
-      if (*it == submitted_form.FormSignature())
-        was_autofilled = true;
-    }
-    // Remove outdated form signatures.
-    if (total_form_checked == 3 && it != autofilled_forms_signatures_.end()) {
-      autofilled_forms_signatures_.erase(it,
-                                         autofilled_forms_signatures_.end());
-    }
-    download_manager_.StartUploadRequest(submitted_form, was_autofilled);
+  if (disable_download_manager_requests_)
+    return;
+
+  // Check if the form is among the forms that were recently auto-filled.
+  bool was_autofilled = false;
+  for (std::list<std::string>::const_iterator it =
+           autofilled_form_signatures_.begin();
+       it != autofilled_form_signatures_.end() && !was_autofilled;
+       ++it) {
+    if (*it == submitted_form.FormSignature())
+      was_autofilled = true;
   }
+
+  FieldTypeSet available_types;
+  personal_data_->GetAvailableFieldTypes(&available_types);
+
+  download_manager_.StartUploadRequest(submitted_form, was_autofilled,
+                                       available_types);
 }
 
 void AutofillManager::Reset() {
   form_structures_.reset();
   has_logged_autofill_enabled_ = false;
   has_logged_address_suggestions_count_ = false;
 }
 
 AutofillManager::AutofillManager(TabContents* tab_contents,
                                  PersonalDataManager* personal_data)
@@ skipping 344 matching lines @@
 void AutofillManager::UnpackGUIDs(int id,
                                   GUIDPair* cc_guid,
                                   GUIDPair* profile_guid) {
   int cc_id = id >> std::numeric_limits<unsigned short>::digits &
       std::numeric_limits<unsigned short>::max();
   int profile_id = id & std::numeric_limits<unsigned short>::max();
 
   *cc_guid = IDToGUID(cc_id);
   *profile_guid = IDToGUID(profile_id);
 }