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

chrome/browser/autofill/form_structure.h

Index: chrome/browser/autofill/form_structure.h
diff --git a/chrome/browser/autofill/form_structure.h b/chrome/browser/autofill/form_structure.h
index ee9b7a795c55d3918613c24837849d89bd5741d5..95b866145ab3a23c8ed92c394e3ee452e12b4358 100644
--- a/chrome/browser/autofill/form_structure.h
+++ b/chrome/browser/autofill/form_structure.h
@@ -45,7 +45,9 @@ class FormStructure {
   void DetermineHeuristicTypes();
 
   // Encodes the XML upload request from this FormStructure.
-  bool EncodeUploadRequest(bool autofill_used, std::string* encoded_xml) const;
+  bool EncodeUploadRequest(const FieldTypeSet& available_field_types,
+                           bool form_was_autofilled,
+                           std::string* encoded_xml) const;
 
   // Encodes the XML query request for the set of forms.
   // All fields are returned in one XML. For example, there are three forms,
@@ -134,10 +136,6 @@ class FormStructure {
   bool EncodeFormRequest(EncodeRequestType request_type,
                          buzz::XmlElement* encompassing_xml_element) const;
 
-  // Helper for EncodeUploadRequest() that collects presense of all data in the
-  // form structure and converts it to string for uploading.
-  std::string ConvertPresenceBitsToString() const;
-
   // The name of the form.
   string16 form_name_;