Propagate correct data to the Toolbar servers

chrome/browser/autofill/form_structure.h

Index: chrome/browser/autofill/form_structure.h
===================================================================
--- chrome/browser/autofill/form_structure.h	(revision 72012)
+++ chrome/browser/autofill/form_structure.h	(working copy)
@@ -41,8 +41,7 @@
   virtual ~FormStructure();
 
   // Encodes the XML upload request from this FormStructure.
-  bool EncodeUploadRequest(bool auto_fill_used,
-                           std::string* encoded_xml) const;
+  bool EncodeUploadRequest(bool auto_fill_used, 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,
@@ -128,6 +127,16 @@
   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 to string for uploading.

[Ilya Sherman, 2011/01/22 01:12:35]

nit: "to to" -> "to"

[GeorgeY, 2011/01/22 01:40:40]

Done.

+  std::string ConvertPresenceBitsToString() const;
+
+  // Returns true if field_set has field types that are allowed to be uploaded
+  // to Toolbar servers. Any singular field is allowed. If there are multiple
+  // fields in the |field_set| they are allowed only if they are different by
+  // HOME/BILLING or HOME/FAX designation.
+  static bool AllowedForUpload(FieldTypeSet const& field_set);
+
   // The name of the form.
   string16 form_name_;