[Autofill] Update expired verified credit cards.

components/autofill/core/browser/credit_card.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/credit_card.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 516 matching lines @@
   set_origin(credit_card.origin());
 }
 
 bool CreditCard::UpdateFromImportedCard(const CreditCard& imported_card,
                                         const std::string& app_locale) {
   if (this->GetInfo(AutofillType(CREDIT_CARD_NUMBER), app_locale) !=
           imported_card.GetInfo(AutofillType(CREDIT_CARD_NUMBER), app_locale)) {
     return false;
   }
 
-  // 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())
+  // Heuristically aggregated data should never overwrite verified data, with
+  // the exception of expired verified cards. 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()) {
+    // If the original card is expired and the imported card is not, and the
+    // name on the cards are identical, update the expiration date.
+    if (this->IsExpired(base::Time::Now()) &&
+        !imported_card.IsExpired(base::Time::Now()) &&
+        (name_on_card_ == imported_card.name_on_card_)) {
+      DCHECK(imported_card.expiration_month_ && imported_card.expiration_year_);
+      expiration_month_ = imported_card.expiration_month_;
+      expiration_year_ = imported_card.expiration_year_;
+    }
     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.
@@ skipping 244 matching lines @@
 const char kAmericanExpressCard[] = "americanExpressCC";
 const char kDinersCard[] = "dinersCC";
 const char kDiscoverCard[] = "discoverCC";
 const char kGenericCard[] = "genericCC";
 const char kJCBCard[] = "jcbCC";
 const char kMasterCard[] = "masterCardCC";
 const char kUnionPay[] = "unionPayCC";
 const char kVisaCard[] = "visaCC";
 
 }  // namespace autofill