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

components/autofill/core/browser/autofill_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/autofill_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 1160 matching lines @@
   return IsAutofillEnabled() && !driver_->IsIncognito() &&
          form.ShouldBeParsed() &&
          (form.active_field_count() >= kRequiredFieldsForUpload ||
           (form.all_fields_are_passwords() &&
            form.active_field_count() >=
                kRequiredFieldsForFormsWithOnlyPasswordFields));
 }
 
 void AutofillManager::ImportFormData(const FormStructure& submitted_form) {
   std::unique_ptr<CreditCard> imported_credit_card;
+  bool imported_credit_card_matches_masked_server_credit_card;
   if (!personal_data_->ImportFormData(
-          submitted_form, IsCreditCardUploadEnabled(), &imported_credit_card)) {
+          submitted_form, IsCreditCardUploadEnabled(), &imported_credit_card,
+          &imported_credit_card_matches_masked_server_credit_card))
     return;
-  }
 
 #ifdef ENABLE_FORM_DEBUG_DUMP
   // Debug code for research on what autofill Chrome extracts from the last few
   // forms when submitting credit card data. See DumpAutofillData().
   bool dump_data = base::CommandLine::ForCurrentProcess()->HasSwitch(
       "dump-autofill-data");
 
   // Save the form data for future dumping.
   if (dump_data) {
     if (recently_autofilled_forms_.size() > 5)
@@ skipping 15 matching lines @@
     }
 
     DumpAutofillData(!!imported_credit_card);
   }
 #endif  // ENABLE_FORM_DEBUG_DUMP
 
   // No card available to offer save or upload.
   if (!imported_credit_card)
     return;
 
-  if (!IsCreditCardUploadEnabled()) {
-    // This block will only be reached if we have observed a new card. In this
-    // case, ImportFormData will return false if the card matches one already
-    // stored.
+  if (!IsCreditCardUploadEnabled() ||
+      imported_credit_card_matches_masked_server_credit_card) {
+    // This block will only be reached if we have observed a new card or a card
+    // whose |TypeAndLastFourDigits|  matches a masked server card.
+    // |ImportFormData| will return false if the card matches a full card that
+    // we have already stored.
     client_->ConfirmSaveCreditCardLocally(
         *imported_credit_card,
         base::Bind(
             base::IgnoreResult(&PersonalDataManager::SaveImportedCreditCard),
             base::Unretained(personal_data_), *imported_credit_card));
   } else {
     // Whereas, because we pass IsCreditCardUploadEnabled() to ImportFormData,
     // this block can be reached on observing either a new card or one already
-    // stored locally. We will offer to upload either kind.
+    // stored locally and whose |TypeAndLastFourDigits| do not match a masked
+    // server card. We will offer to upload either kind.
     upload_request_ = payments::PaymentsClient::UploadRequestDetails();
     upload_request_.card = *imported_credit_card;
 
     // In order to prompt the user to upload their card, we must have both:
     //  1) Card with CVC
     //  2) 1+ recently-used or modified addresses that meet the client-side
     //     validation rules
     // Here we perform both checks before returning or logging anything,
     // because if only one of the two is missing, it may be fixable.
 
@@ skipping 1019 matching lines @@
 }
 #endif  // ENABLE_FORM_DEBUG_DUMP
 
 void AutofillManager::LogCardUploadDecisionUkm(
     AutofillMetrics::CardUploadDecisionMetric upload_decision) {
   AutofillMetrics::LogCardUploadDecisionUkm(
       client_->GetUkmService(), pending_upload_request_url_, upload_decision);
 }
 
 }  // namespace autofill