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

components/autofill/browser/autofill_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/autofill_manager.h"
 
 #include <stddef.h>
 
 #include <limits>
 #include <map>
@@ skipping 322 matching lines @@
 
   submitted_form->UpdateFromCache(*cached_submitted_form);
   // Don't prompt the user to save data entered by Autocheckout.
   if (submitted_form->IsAutofillable(true) &&
       !submitted_form->filled_by_autocheckout())
     ImportFormData(*submitted_form);
 
   // Only upload server statistics and UMA metrics if at least some local data
   // is available to use as a baseline.
   const std::vector<AutofillProfile*>& profiles = personal_data_->GetProfiles();
-  const std::vector<CreditCard*>& credit_cards = personal_data_->credit_cards();

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

nit: Please preserve this variable name.

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

Done.

-  if (!profiles.empty() || !credit_cards.empty()) {
+  const std::vector<CreditCard*>& cards = personal_data_->GetCreditCards();
+  if (!profiles.empty() || !cards.empty()) {
     // Copy the profile and credit card data, so that it can be accessed on a
     // separate thread.
     std::vector<AutofillProfile> copied_profiles;
     copied_profiles.reserve(profiles.size());
     for (std::vector<AutofillProfile*>::const_iterator it = profiles.begin();
          it != profiles.end(); ++it) {
       copied_profiles.push_back(**it);
     }
 
-    std::vector<CreditCard> copied_credit_cards;
-    copied_credit_cards.reserve(credit_cards.size());
-    for (std::vector<CreditCard*>::const_iterator it = credit_cards.begin();
-         it != credit_cards.end(); ++it) {
-      copied_credit_cards.push_back(**it);
+    std::vector<CreditCard> copied_cards;
+    copied_cards.reserve(cards.size());
+    for (std::vector<CreditCard*>::const_iterator it = cards.begin();
+         it != cards.end(); ++it) {
+      copied_cards.push_back(**it);
     }
 
     // Note that ownership of |submitted_form| is passed to the second task,
     // using |base::Owned|.
     FormStructure* raw_submitted_form = submitted_form.get();
     BrowserThread::GetBlockingPool()->PostTaskAndReply(
         FROM_HERE,
         base::Bind(&DeterminePossibleFieldTypesForUpload,
                    copied_profiles,
-                   copied_credit_cards,
+                   copied_cards,
                    app_locale_,
                    raw_submitted_form),
         base::Bind(&AutofillManager::UploadFormDataAsyncCallback,
                    weak_ptr_factory_.GetWeakPtr(),
                    base::Owned(submitted_form.release()),
                    forms_loaded_timestamp_,
                    initial_interaction_timestamp_,
                    timestamp));
   }
 
@@ skipping 584 matching lines @@
 void AutofillManager::set_metric_logger(const AutofillMetrics* metric_logger) {
   metric_logger_.reset(metric_logger);
 }
 
 bool AutofillManager::GetHost(RenderViewHost** host) const {
   if (!IsAutofillEnabled())
     return false;
 
   // No autofill data to return if the profiles are empty.
   if (personal_data_->GetProfiles().empty() &&
-      personal_data_->credit_cards().empty()) {
+      personal_data_->GetCreditCards().empty()) {
     return false;
   }
 
   *host = web_contents()->GetRenderViewHost();
   if (!*host)
     return false;
 
   return true;
 }
 
@@ skipping 287 matching lines @@
 
 void AutofillManager::UpdateInitialInteractionTimestamp(
     const TimeTicks& interaction_timestamp) {
   if (initial_interaction_timestamp_.is_null() ||
       interaction_timestamp < initial_interaction_timestamp_) {
     initial_interaction_timestamp_ = interaction_timestamp;
   }
 }
 
 }  // namespace autofill