Autofill Multi-Value: Additional profiles with same name and address not added to DOM UI

chrome/browser/autofill/personal_data_manager.cc

 // Copyright (c) 2011 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/personal_data_manager.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/logging.h"
@@ skipping 432 matching lines @@
        iter != credit_cards->end(); ++iter) {
     credit_cards_.push_back(new CreditCard(*iter));
   }
 
   // Read our writes to ensure consistency with the database.
   Refresh();
 
   FOR_EACH_OBSERVER(Observer, observers_, OnPersonalDataChanged());
 }
 
-// TODO(jhawkins): Refactor SetProfiles so this isn't so hacky.
+// TODO(dhollowa): Refactor to eliminate batch update of |SetProfiles|.
+// http://crbug.com/73068
 void PersonalDataManager::AddProfile(const AutofillProfile& profile) {
-  // Don't save a web profile if the data in the profile is a subset of an
-  // auxiliary profile.
-  for (std::vector<AutofillProfile*>::const_iterator iter =
-           auxiliary_profiles_.begin();
-       iter != auxiliary_profiles_.end(); ++iter) {
-    if (profile.IsSubsetOf(**iter))
-      return;
-  }
+  std::vector<AutofillProfile> profiles(web_profiles_.size());
+  std::transform(web_profiles_.begin(), web_profiles_.end(),
+                 profiles.begin(),
+                 DereferenceFunctor<AutofillProfile>());
 
-  std::vector<AutofillProfile> profiles;
-  MergeProfile(profile, web_profiles_.get(), &profiles);
+  profiles.push_back(profile);
   SetProfiles(&profiles);
 }
 
 void PersonalDataManager::UpdateProfile(const AutofillProfile& profile) {
   WebDataService* wds = profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
   if (!wds)
     return;
 
   // Update the cached profile.
   for (std::vector<AutofillProfile*>::iterator iter = web_profiles_->begin();
        iter != web_profiles_->end(); ++iter) {
     if ((*iter)->guid() == profile.guid()) {
       delete *iter;
       *iter = new AutofillProfile(profile);
       break;
     }
   }
 
   // Ensure that profile labels are up to date.
   AutofillProfile::AdjustInferredLabels(&web_profiles_.get());
 
   wds->UpdateAutofillProfile(profile);
   FOR_EACH_OBSERVER(Observer, observers_, OnPersonalDataChanged());
 }
 
+// TODO(dhollowa): Refactor to eliminate batch update of |SetProfiles|.
+// http://crbug.com/73068
 void PersonalDataManager::RemoveProfile(const std::string& guid) {
-  // TODO(jhawkins): Refactor SetProfiles so this isn't so hacky.
   std::vector<AutofillProfile> profiles(web_profiles_.size());
   std::transform(web_profiles_.begin(), web_profiles_.end(),
                  profiles.begin(),
                  DereferenceFunctor<AutofillProfile>());
 
   // Remove the profile that matches |guid|.
   profiles.erase(
       std::remove_if(profiles.begin(), profiles.end(),
                      FormGroupMatchesByGUIDFunctor<AutofillProfile>(guid)),
       profiles.end());
 
   SetProfiles(&profiles);
 }
 
 AutofillProfile* PersonalDataManager::GetProfileByGUID(
     const std::string& guid) {
   for (std::vector<AutofillProfile*>::iterator iter = web_profiles_->begin();
        iter != web_profiles_->end(); ++iter) {
     if ((*iter)->guid() == guid)
       return *iter;
   }
   return NULL;
 }
 
-// TODO(jhawkins): Refactor SetCreditCards so this isn't so hacky.
+// TODO(dhollowa): Refactor to eliminate batch update of |SetCreditCards|.
+// http://crbug.com/73068
 void PersonalDataManager::AddCreditCard(const CreditCard& credit_card) {
   std::vector<CreditCard> credit_cards(credit_cards_.size());
   std::transform(credit_cards_.begin(), credit_cards_.end(),
                  credit_cards.begin(),
                  DereferenceFunctor<CreditCard>());
 
   credit_cards.push_back(credit_card);
   SetCreditCards(&credit_cards);
 }
 
 void PersonalDataManager::UpdateCreditCard(const CreditCard& credit_card) {
   WebDataService* wds = profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
   if (!wds)
     return;
 
   // Update the cached credit card.
   for (std::vector<CreditCard*>::iterator iter = credit_cards_->begin();
        iter != credit_cards_->end(); ++iter) {
     if ((*iter)->guid() == credit_card.guid()) {
       delete *iter;
       *iter = new CreditCard(credit_card);
       break;
     }
   }
 
   wds->UpdateCreditCard(credit_card);
   FOR_EACH_OBSERVER(Observer, observers_, OnPersonalDataChanged());
 }
 
+// TODO(dhollowa): Refactor to eliminate batch update of |SetCreditCards|.
+// http://crbug.com/73068
 void PersonalDataManager::RemoveCreditCard(const std::string& guid) {
-  // TODO(jhawkins): Refactor SetCreditCards so this isn't so hacky.
   std::vector<CreditCard> credit_cards(credit_cards_.size());
   std::transform(credit_cards_.begin(), credit_cards_.end(),
                  credit_cards.begin(),
                  DereferenceFunctor<CreditCard>());
 
   // Remove the credit card that matches |guid|.
   credit_cards.erase(
       std::remove_if(credit_cards.begin(), credit_cards.end(),
                      FormGroupMatchesByGUIDFunctor<CreditCard>(guid)),
       credit_cards.end());
@@ skipping 273 matching lines @@
     web_data_service->CancelRequest(*handle);
   }
   *handle = 0;
 }
 
 void PersonalDataManager::SaveImportedProfile(
     const AutofillProfile& imported_profile) {
   if (profile_->IsOffTheRecord())
     return;
 
-  AddProfile(imported_profile);
+  // Don't save a web profile if the data in the profile is a subset of an
+  // auxiliary profile.
+  for (std::vector<AutofillProfile*>::const_iterator iter =
+           auxiliary_profiles_.begin();
+       iter != auxiliary_profiles_.end(); ++iter) {
+    if (imported_profile.IsSubsetOf(**iter))
+      return;
+  }
+
+  std::vector<AutofillProfile> profiles;
+  MergeProfile(imported_profile, web_profiles_.get(), &profiles);
+  SetProfiles(&profiles);
 }
 
 
 void PersonalDataManager::SaveImportedCreditCard(
     const CreditCard& imported_credit_card) {
   if (profile_->IsOffTheRecord())
     return;
 
   // Set to true if |imported_credit_card| is merged into the credit card list.
   bool merged = false;
@@ skipping 63 matching lines @@
 }
 
 const AutofillMetrics* PersonalDataManager::metric_logger() const {
   return metric_logger_.get();
 }
 
 void PersonalDataManager::set_metric_logger(
     const AutofillMetrics* metric_logger) {
   metric_logger_.reset(metric_logger);
 }