Offer to save card locally if user manually enters same card number as

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 <stddef.h>
 
 #include <algorithm>
 #include <list>
@@ skipping 424 matching lines @@
 }
 
 void PersonalDataManager::RemoveObserver(
     PersonalDataManagerObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 bool PersonalDataManager::ImportFormData(
     const FormStructure& form,
     bool should_return_local_card,
-    std::unique_ptr<CreditCard>* imported_credit_card) {
+    std::unique_ptr<CreditCard>* imported_credit_card,
+    bool* imported_credit_card_matches_masked_server_credit_card) {
   // We try the same |form| for both credit card and address import/update.
   // - ImportCreditCard may update an existing card, or fill
   //   |imported_credit_card| with an extracted card. See .h for details of
-  //   |should_return_local_card|.
+  //   |should_return_local_card| and
+  //   |imported_credit_card_matches_masked_server_credit_card|.
   bool cc_import =
-      ImportCreditCard(form, should_return_local_card, imported_credit_card);
+      ImportCreditCard(form, should_return_local_card, imported_credit_card,
+                       imported_credit_card_matches_masked_server_credit_card);
   // - ImportAddressProfiles may eventually save or update one or more address
   //   profiles.
   bool address_import = ImportAddressProfiles(form);
   if (cc_import || address_import)
     return true;
 
   for (PersonalDataManagerObserver& observer : observers_)
     observer.OnInsufficientFormData();
   return false;
 }
@@ skipping 1028 matching lines @@
   if (!IsValidLearnableProfile(candidate_profile, app_locale_))
     return false;
 
   SaveImportedProfile(candidate_profile);
   return true;
 }
 
 bool PersonalDataManager::ImportCreditCard(
     const FormStructure& form,
     bool should_return_local_card,
-    std::unique_ptr<CreditCard>* imported_credit_card) {
+    std::unique_ptr<CreditCard>* imported_credit_card,
+    bool* imported_credit_card_matches_masked_server_credit_card) {
   DCHECK(!imported_credit_card->get());
+  *imported_credit_card_matches_masked_server_credit_card = false;
 
   // The candidate for credit card import. There are many ways for the candidate
   // to be rejected (see everywhere this function returns false, below).
   CreditCard candidate_credit_card;
   candidate_credit_card.set_origin(form.source_url().spec());
 
   std::set<ServerFieldType> types_seen;
   for (const auto& field : form) {
     base::string16 value;
     base::TrimWhitespace(field->value, base::TRIM_ALL, &value);
@@ skipping 42 matching lines @@
 
   // Reject the credit card if we did not detect enough filled credit card
   // fields (such as valid number, month, year).
   if (!candidate_credit_card.IsValid())
     return false;
 
   // Attempt to merge with an existing credit card. Don't present a prompt if we
   // have already saved this card number, unless |should_return_local_card| is
   // true which indicates that upload is enabled. In this case, it's useful to
   // present the upload prompt to the user to promote the card from a local card
-  // to a synced server card.
+  // to a synced server card, provided we don't have a masked server card with
+  // the same |TypeAndLastFourDigits|.
   for (const auto& 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(candidate_credit_card,
                                          app_locale_)) {
       UpdateCreditCard(card_copy);
       // If we should not return the local card, return that we merged it,
       // without setting |imported_credit_card|.
       if (!should_return_local_card)
         return true;
 
       break;
     }
   }
 
-  // Also don't offer to save if we already have this stored as a server card.
-  // We only check the number because if the new card has the same number as the
-  // server card, upload is guaranteed to fail. There's no mechanism for entries
-  // with the same number but different names or expiration dates as there is
-  // for local cards.
+  // Also don't offer to save if we already have this stored as a full server
+  // card. We only check the number because if the new card has the same number
+  // as the server card, upload is guaranteed to fail. There's no mechanism for
+  // entries with the same number but different names or expiration dates as
+  // there is for local cards.
+  // We can offer to save locally even if we already have this stored another
+  // masked server card with the same |TypeAndLastFourDigits| so that the user
+  // can enter the full card number without having to unmask the card.
   for (const auto& card : server_credit_cards_) {
-    if (candidate_credit_card.HasSameNumberAs(*card))
-      return false;
+    if (candidate_credit_card.HasSameNumberAs(*card)) {
+      if (card->record_type() == CreditCard::FULL_SERVER_CARD)
+        return false;
+      DCHECK_EQ(card->record_type(), CreditCard::MASKED_SERVER_CARD);
+      *imported_credit_card_matches_masked_server_credit_card = true;
+      break;
+    }
   }
 
   imported_credit_card->reset(new CreditCard(candidate_credit_card));
   return true;
 }
 
 const std::vector<AutofillProfile*>& PersonalDataManager::GetProfiles(
     bool record_metrics) const {
   profiles_.clear();
   for (const auto& profile : web_profiles_)
@@ skipping 438 matching lines @@
       existing_profiles->back().SetRawInfo(EMAIL_ADDRESS, email);
 
     AutofillMetrics::LogWalletAddressConversionType(
         AutofillMetrics::CONVERTED_ADDRESS_ADDED);
   }
 
   return guid;
 }
 
 }  // namespace autofill