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 159 matching lines @@
   // 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.
   // May be NULL.  NULL indicates OTR.
   PersonalDataManager* personal_data_;
 
-  std::list<std::string> autofilled_forms_signatures_;
+  struct AutofilledFormInfo {
+    // Signature of the form that was autofilled.
+    std::string form_signature;
+    // Guid of the address profile that was used for autofill.
+    std::string profile_guid;
+    // Guid of the credit card profile that was used for autofill.
+    std::string cc_guid;
+  };
+  std::list<AutofilledFormInfo> autofilled_forms_signatures_;
   // Handles queries and uploads to AutoFill servers.
   AutoFillDownloadManager download_manager_;
 
   // Should be set to true in AutoFillManagerTest and other tests, false in
   // AutoFillDownloadManagerTest and in non-test environment. Is false by
   // default for the public constructor, and true by default for the test-only
   // constructors.
   bool disable_download_manager_requests_;
 
   // For logging UMA metrics. Overridden by metrics tests.
@@ skipping 19 matching lines @@
   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);
 
   DISALLOW_COPY_AND_ASSIGN(AutoFillManager);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_