[Autofill] Support "importing" verified profiles and credit cards.

components/autofill/browser/credit_card.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/credit_card.h"
 
 #include <stddef.h>
 
 #include <ostream>
 #include <string>
@@ skipping 480 matching lines @@
   set_origin(credit_card.origin());
 }
 
 bool CreditCard::UpdateFromImportedCard(const CreditCard& imported_card,
                                         const std::string& app_locale) {
   if (this->GetInfo(CREDIT_CARD_NUMBER, app_locale) !=
           imported_card.GetInfo(CREDIT_CARD_NUMBER, app_locale)) {
     return false;
   }
 
-  DCHECK(!imported_card.IsVerified());
-  if (this->IsVerified())
+  // Heuristically aggregated data should never overwrite verified data.
+  // Instead, discard any heuristically aggregated credit cards that disagree
+  // with explicitly entered data, so that the UI is not cluttered with
+  // duplicate cards.
+  if (this->IsVerified() && !imported_card.IsVerified())
     return true;
 
+  set_origin(imported_card.origin());
+
   // Note that the card number is intentionally not updated, so as to preserve
   // any formatting (i.e. separator characters).  Since the card number is not
   // updated, there is no reason to update the card type, either.
   if (!imported_card.name_on_card_.empty())
     name_on_card_ = imported_card.name_on_card_;
 
   // The expiration date for |imported_card| should always be set.
   DCHECK(imported_card.expiration_month_ && imported_card.expiration_year_);
   expiration_month_ = imported_card.expiration_month_;
   expiration_year_ = imported_card.expiration_year_;
@@ skipping 167 matching lines @@
 const char* const kAmericanExpressCard = "americanExpressCC";
 const char* const kDinersCard = "dinersCC";
 const char* const kDiscoverCard = "discoverCC";
 const char* const kGenericCard = "genericCC";
 const char* const kJCBCard = "jcbCC";
 const char* const kMasterCard = "masterCardCC";
 const char* const kSoloCard = "soloCC";
 const char* const kVisaCard = "visaCC";
 
 }  // namespace autofill