Make PersonalDataManager use GetCreditCards() (rather than using credit_cards_ directly) so Autofill

components/autofill/browser/personal_data_manager.cc

 // Copyright (c) 2012 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 "components/autofill/browser/personal_data_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <iterator>
 
@@ skipping 476 matching lines @@
   if (is_credit_card)
     autofill_data->RemoveCreditCard(guid);
   else
     autofill_data->RemoveAutofillProfile(guid);
 
   // Refresh our local cache and send notifications to observers.
   Refresh();
 }
 
 CreditCard* PersonalDataManager::GetCreditCardByGUID(const std::string& guid) {
-  for (std::vector<CreditCard*>::iterator iter = credit_cards_.begin();
-       iter != credit_cards_.end(); ++iter) {
+  const std::vector<CreditCard*>& credit_cards = GetCreditCards();
+  for (std::vector<CreditCard*>::const_iterator iter = credit_cards.begin();
+       iter != credit_cards.end(); ++iter) {
     if ((*iter)->guid() == guid)
       return *iter;
   }
   return NULL;
 }
 
 void PersonalDataManager::GetNonEmptyTypes(
     FieldTypeSet* non_empty_types) {
   const std::vector<AutofillProfile*>& profiles = GetProfiles();
   for (std::vector<AutofillProfile*>::const_iterator iter = profiles.begin();
@@ skipping 25 matching lines @@
   profiles_.insert(profiles_.end(), web_profiles_.begin(), web_profiles_.end());
   profiles_.insert(profiles_.end(),
       auxiliary_profiles_.begin(), auxiliary_profiles_.end());
   return profiles_;
 }
 
 const std::vector<AutofillProfile*>& PersonalDataManager::web_profiles() const {
   return web_profiles_.get();
 }
 
-const std::vector<CreditCard*>& PersonalDataManager::credit_cards() const {
+const std::vector<CreditCard*>& PersonalDataManager::GetCreditCards() const {
   return credit_cards_.get();
 }
 
 void PersonalDataManager::Refresh() {
   LoadProfiles();
   LoadCreditCards();
 }
 
 void PersonalDataManager::GetProfileSuggestions(
     AutofillFieldType type,
@@ skipping 81 matching lines @@
     const base::string16& field_contents,
     std::vector<base::string16>* values,
     std::vector<base::string16>* labels,
     std::vector<base::string16>* icons,
     std::vector<GUIDPair>* guid_pairs) {
   values->clear();
   labels->clear();
   icons->clear();
   guid_pairs->clear();
 
-  for (std::vector<CreditCard*>::const_iterator iter = credit_cards().begin();
-       iter != credit_cards().end(); ++iter) {
+  for (std::vector<CreditCard*>::const_iterator iter = credit_cards_.begin();

[Ilya Sherman, 2013/04/30 08:20:29]

Why not use GetCreditCards() for this method as well?

[Dan Beam, 2013/05/01 03:46:44]

Done.

+       iter != credit_cards_.end(); ++iter) {
     CreditCard* credit_card = *iter;
 
     // The value of the stored data for this field type in the |credit_card|.
     base::string16 creditcard_field_value =
         credit_card->GetInfo(type, app_locale_);
     if (!creditcard_field_value.empty() &&
         StartsWith(creditcard_field_value, field_contents, false)) {
       if (type == CREDIT_CARD_NUMBER)
         creditcard_field_value = credit_card->ObfuscatedNumber();
 
@@ skipping 340 matching lines @@
     const AutofillMetrics* metric_logger) {
   metric_logger_.reset(metric_logger);
 }
 
 void PersonalDataManager::set_browser_context(
     content::BrowserContext* context) {
   browser_context_ = context;
 }
 
 }  // namespace autofill