Merge 53276 - AutoFill Empty profiles should not be saved from AutoFillDialog...

chrome/browser/autofill/personal_data_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/personal_data_manager.h"
 
 #include <algorithm>
 #include <iterator>
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/autofill/autofill_field.h"
 #include "chrome/browser/autofill/form_structure.h"
 #include "chrome/browser/autofill/phone_number.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/common/pref_names.h"
 
 namespace {
 
 // The minimum number of fields that must contain user data and have known types
 // before AutoFill will attempt to import the data into a profile.
 const int kMinImportSize = 3;
 
 const char kUnlabeled[] = "Unlabeled";
 
-bool IsEmptyProfile(const AutoFillProfile& profile) {
-  FieldTypeSet types;
-  profile.GetAvailableFieldTypes(&types);
-  return types.empty();
-}
-
-bool IsEmptyCreditCard(const CreditCard& credit_card) {
-  FieldTypeSet types;
-  credit_card.GetAvailableFieldTypes(&types);
-  return types.empty() && credit_card.billing_address().empty();
-}
-
 }  // namespace
 
 PersonalDataManager::~PersonalDataManager() {
   CancelPendingQuery(&pending_profiles_query_);
   CancelPendingQuery(&pending_creditcards_query_);
 }
 
 void PersonalDataManager::OnWebDataServiceRequestDone(
     WebDataService::Handle h,
     const WDTypedResult* result) {
@@ skipping 172 matching lines @@
   }
   *credit_card = imported_credit_card_.get();
 }
 
 void PersonalDataManager::SetProfiles(std::vector<AutoFillProfile>* profiles) {
   if (profile_->IsOffTheRecord())
     return;
 
   // Remove empty profiles from input.
   profiles->erase(
-      std::remove_if(profiles->begin(), profiles->end(), IsEmptyProfile),
+      std::remove_if(profiles->begin(), profiles->end(),
+                     std::mem_fun_ref(&AutoFillProfile::IsEmpty)),
       profiles->end());
 
   SetUniqueProfileLabels(profiles);
 
   WebDataService* wds = profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
   if (!wds)
     return;
 
   AutoLock lock(unique_ids_lock_);
 
@@ skipping 58 matching lines @@
 }
 
 void PersonalDataManager::SetCreditCards(
     std::vector<CreditCard>* credit_cards) {
   if (profile_->IsOffTheRecord())
     return;
 
   // Remove empty credit cards from input.
   credit_cards->erase(
       std::remove_if(
-          credit_cards->begin(), credit_cards->end(), IsEmptyCreditCard),
+          credit_cards->begin(), credit_cards->end(),
+          std::mem_fun_ref(&CreditCard::IsEmpty)),
       credit_cards->end());
 
   SetUniqueCreditCardLabels(credit_cards);
 
   WebDataService* wds = profile_->GetWebDataService(Profile::EXPLICIT_ACCESS);
   if (!wds)
     return;
 
   AutoLock lock(unique_ids_lock_);
 
@@ skipping 374 matching lines @@
     }
 
     creditcards.push_back(**iter);
   }
 
   if (!merged)
     creditcards.push_back(*imported_credit_card_);
 
   SetCreditCards(&creditcards);
 }