Propagate correct data to the Toolbar servers

chrome/browser/autofill/autofill_manager.cc

 // 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.
 
 #include "chrome/browser/autofill/autofill_manager.h"
 
 #include <limits>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 391 matching lines @@
       FillCreditCardFormField(credit_card, autofill_type, &result.fields[j]);
     } else if (profile &&
                autofill_type.group() != AutoFillType::CREDIT_CARD) {
       FillFormField(profile, autofill_type, &result.fields[j]);
     }
 
     // We found a matching field in the |form_structure| so we
     // proceed to the next |result| field, and the next |form_structure|.
     ++i;
   }
-  autofilled_forms_signatures_.push_front(form_structure->FormSignature());
+  AutofilledFormInfo form_info;
+  form_info.form_signature = form_structure->FormSignature();
+  form_info.profile_guid = profile_guid;
+  form_info.cc_guid = cc_guid;
+  autofilled_forms_signatures_.push_front(form_info);
 
   host->Send(new ViewMsg_AutoFillFormDataFilled(
         host->routing_id(), query_id, result));
 }
 
 void AutoFillManager::OnShowAutoFillDialog() {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableTabbedOptions)) {
     Browser* browser = BrowserList::GetLastActive();
     if (browser)
@@ skipping 114 matching lines @@
     tab_contents_->AddInfoBar(new AutoFillCCInfoBarDelegate(tab_contents_,
                                                             this));
   }
 }
 
 void AutoFillManager::UploadFormData() {
   if (!disable_download_manager_requests_ && upload_form_structure_.get()) {
     bool was_autofilled = false;
     // Check if the form among last 3 forms that were auto-filled.
     // Clear older signatures.
-    std::list<std::string>::iterator it;
+    std::list<AutofilledFormInfo>::iterator it;
     int total_form_checked = 0;
+    std::string profile_guid, cc_guid;
     for (it = autofilled_forms_signatures_.begin();
          it != autofilled_forms_signatures_.end() && total_form_checked < 3;
          ++it, ++total_form_checked) {
-      if (*it == upload_form_structure_->FormSignature())
+      if (it->form_signature == upload_form_structure_->FormSignature()) {
         was_autofilled = true;
+        profile_guid = it->profile_guid;
+        cc_guid = it->cc_guid;
+      }
     }
     // Remove outdated form signatures.
     if (total_form_checked == 3 && it != autofilled_forms_signatures_.end()) {
       autofilled_forms_signatures_.erase(it,
                                          autofilled_forms_signatures_.end());
     }
     download_manager_.StartUploadRequest(*(upload_form_structure_.get()),
-                                         was_autofilled);
+        was_autofilled,
+        personal_data_->PresentData(profile_guid, cc_guid).c_str());
   }
 }
 
 void AutoFillManager::Reset() {
   upload_form_structure_.reset();
   form_structures_.reset();
 }
 
 void AutoFillManager::OnInfoBarClosed(bool should_save) {
   if (should_save)
@@ skipping 287 matching lines @@
     return std::string();
 
   std::map<int, std::string>::const_iterator iter = id_guid_map_.find(id);
   if (iter == id_guid_map_.end()) {
     NOTREACHED();
     return std::string();
   }
 
   return iter->second;
 }