Autofill - Don't save a credit card locally if it's already saved in Wallet.

components/autofill/core/browser/personal_data_manager.cc

 // Copyright 2013 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/core/browser/personal_data_manager.h"
 
 #include <algorithm>
 #include <functional>
 #include <iterator>
 
@@ skipping 429 matching lines @@
   // Reject the credit card if we did not detect enough filled credit card
   // fields or if the credit card number does not seem to be valid.
   if (local_imported_credit_card.get() &&
       !local_imported_credit_card->IsComplete()) {
     local_imported_credit_card.reset();
   }
 
   // Don't import if we already have this info.
   // Don't present an infobar if we have already saved this card number.
   bool merged_credit_card = false;
-  if (local_imported_credit_card.get()) {
+  if (local_imported_credit_card) {
     for (CreditCard* card : local_credit_cards_) {
       // Make a local copy so that the data in |local_credit_cards_| isn't
       // modified directly by the UpdateFromImportedCard() call.
       CreditCard card_copy(*card);
       if (card_copy.UpdateFromImportedCard(*local_imported_credit_card.get(),
                                            app_locale_)) {
         merged_credit_card = true;
         UpdateCreditCard(card_copy);
         local_imported_credit_card.reset();
         break;
       }
     }
   }
 
+  // Also don't offer to save if we already have this stored as a full wallet
+  // card. (In particular this comes up just after filling and submitting a
+  // Wallet card.)
+  if (local_imported_credit_card) {
+    for (CreditCard* card : server_credit_cards_) {
+      if (card->record_type() == CreditCard::FULL_SERVER_CARD &&
+          local_imported_credit_card->IsLocalDuplicateOfServerCard(*card)) {
+        local_imported_credit_card.reset();
+        break;
+      }
+    }
+  }
+
   if (imported_profile.get()) {
     // We always save imported profiles.
     SaveImportedProfile(*imported_profile);
   }
   *imported_credit_card = local_imported_credit_card.Pass();
 
   if (imported_profile.get() || *imported_credit_card || merged_credit_card)
     return true;
 
   FOR_EACH_OBSERVER(PersonalDataManagerObserver, observers_,
@@ skipping 787 matching lines @@
   }
   if (IsExperimentalWalletIntegrationEnabled() &&
       pref_service_->GetBoolean(prefs::kAutofillWalletImportEnabled)) {
     profiles_.insert(
         profiles_.end(), server_profiles_.begin(), server_profiles_.end());
   }
   return profiles_;
 }
 
 }  // namespace autofill