Propagate correct data to the Toolbar servers

chrome/browser/autofill/autofill_manager.h

Index: chrome/browser/autofill/autofill_manager.h
===================================================================
--- chrome/browser/autofill/autofill_manager.h	(revision 71339)
+++ chrome/browser/autofill/autofill_manager.h	(working copy)
@@ -67,15 +67,22 @@
   // Returns the value of the AutoFillEnabled pref.
   virtual bool IsAutoFillEnabled() const;
 
-  // Handles the form data submitted by the user.
-  void HandleSubmit();
+  // Handles the form data submitted by the user. |data_present| indicates
+  // bitfield of the fields that we autofilled.

[Ilya Sherman, 2011/01/13 23:44:37]

Looks to me like |data_present| indicates fields that match profile data,
whether they were autofilled or not.  It might be simpler, though, to just set
|data_present| to be a bitfield of all 1's -- does that break anything?

[GeorgeY, 2011/01/18 21:04:56]

I think it does. It would mean that UNKNOWN fields are actually matched!

+  void HandleSubmit(std::string const& data_present);
 
   // Uploads the form data to the AutoFill server.
-  void UploadFormData();
+  void UploadFormData(std::string const& data_present);
 
   // Reset cache.
   void Reset();
 
+  // Set |field_type| presence bit in the |bitfield|.
+  void SetPresenceBit(AutoFillFieldType field_type,
+                      std::vector<uint8>* bitfield);
+  // Converts |bitfield| to string for uploading.
+  std::string ConvertPresenceBitsToString(std::vector<uint8> const& bitfield);

[Ilya Sherman, 2011/01/13 23:44:37]

nit: I think these should live in autofill_download rather than here (in an
effort to avoid autofill_manager becoming our dumping ground).

[GeorgeY, 2011/01/18 21:04:56]

np. done.

+
  protected:
   // For tests.
   AutoFillManager();
@@ -173,8 +180,9 @@
   void ParseForms(const std::vector<webkit_glue::FormData>& forms);
 
   // Uses existing personal data to determine possible field types for the
-  // |upload_form_structure_|.
-  void DeterminePossibleFieldTypesForUpload(
+  // |upload_form_structure_|. Returns string representation of the bitfield of
+  // all of the fields types that we will send information for the form.
+  std::string DeterminePossibleFieldTypesForUpload(
       const FormStructure* cached_upload_form_structure);
 
   // The TabContents hosting this AutoFillManager.
@@ -211,6 +219,9 @@
   // Deletes itself when closed.
   AutoFillCCInfoBarDelegate* cc_infobar_;
 
+  // Bitfield that indicates which fields were autofilled for last Credit Card.
+  std::string data_autofilled_;
+
   // GUID to ID mapping.  We keep two maps to convert back and forth.
   std::map<std::string, int> guid_id_map_;
   std::map<int, std::string> id_guid_map_;