Propagate correct data to the Toolbar servers

chrome/browser/autofill/autofill_manager.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_
 #define CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_
 #pragma once
 
 #include <list>
 #include <string>
@@ skipping 49 matching lines @@
   virtual void OnLoadedAutoFillHeuristics(const std::string& heuristic_xml);
   virtual void OnUploadedAutoFillHeuristics(const std::string& form_signature);
   virtual void OnHeuristicsRequestError(
       const std::string& form_signature,
       AutoFillDownloadManager::AutoFillRequestType request_type,
       int http_error);
 
   // 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();
   AutoFillManager(TabContents* tab_contents,
                   PersonalDataManager* personal_data);
 
   void set_personal_data_manager(PersonalDataManager* personal_data) {
     personal_data_ = personal_data;
   }
 
@@ skipping 77 matching lines @@
 
   // Set |field| argument's value for phone number based on contents of the
   // |profile|.
   void FillPhoneNumberField(const AutoFillProfile* profile,
                             webkit_glue::FormField* field);
 
   // Parses the forms using heuristic matching and querying the AutoFill server.
   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.
   // Weak reference.
   // May not be NULL.
   TabContents* tab_contents_;
 
   // The personal data manager, used to save and load personal data to/from the
   // web database.  This is overridden by the AutoFillManagerTest.
   // Weak reference.
@@ skipping 16 matching lines @@
   // Our copy of the form data.
   ScopedVector<FormStructure> form_structures_;
 
   // The form data the user has submitted.
   scoped_ptr<FormStructure> upload_form_structure_;
 
   // The InfoBar that asks for permission to store credit card information.
   // 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_;
 
   friend class AutoFillManagerTest;
   friend class FormStructureBrowserTest;
   FRIEND_TEST_ALL_PREFIXES(AutoFillManagerTest, FillCreditCardForm);
   FRIEND_TEST_ALL_PREFIXES(AutoFillManagerTest, FillAddressForm);
   FRIEND_TEST_ALL_PREFIXES(AutoFillManagerTest, FillAddressAndCreditCardForm);
   FRIEND_TEST_ALL_PREFIXES(AutoFillManagerTest, FillAutoFilledForm);
   FRIEND_TEST_ALL_PREFIXES(AutoFillManagerTest, FillPhoneNumber);
   FRIEND_TEST_ALL_PREFIXES(AutoFillManagerTest, FormChangesRemoveField);
   FRIEND_TEST_ALL_PREFIXES(AutoFillManagerTest, FormChangesAddField);
   FRIEND_TEST_ALL_PREFIXES(AutoFillMetricsTest, QualityMetrics);
   FRIEND_TEST_ALL_PREFIXES(AutoFillMetricsTest,
                            NoQualityMetricsForNonAutoFillableForms);
   FRIEND_TEST_ALL_PREFIXES(AutoFillMetricsTest, QualityMetricsForFailure);
 
   DISALLOW_COPY_AND_ASSIGN(AutoFillManager);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_