[Autofill] Don't fill expiration date of expired credit cards.

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>
 #include <map>
@@ skipping 789 matching lines @@
   std::list<const CreditCard*> cards_to_suggest(credit_cards.begin(),
                                                 credit_cards.end());
 
   DedupeCreditCardToSuggest(&cards_to_suggest);
 
   // Rank the cards by frecency (see AutofillDataModel for details). All expired
   // cards should be suggested last, also by frecency.
   base::Time comparison_time = base::Time::Now();
   cards_to_suggest.sort(
       [comparison_time](const CreditCard* a, const CreditCard* b) {
-        bool a_has_valid_expiration = IsValidCreditCardExpirationDate(
-            a->expiration_year(), a->expiration_month(), comparison_time);
-        if (a_has_valid_expiration !=
-            IsValidCreditCardExpirationDate(
-                b->expiration_year(), b->expiration_month(), comparison_time))
-          return a_has_valid_expiration;
+        bool a_is_expired = a->IsExpired(comparison_time);
+        if (a_is_expired != b->IsExpired(comparison_time))
+          return !a_is_expired;
 
         return a->CompareFrecency(b, comparison_time);
       });
 
   return GetSuggestionsForCards(type, field_contents, cards_to_suggest);
 }
 
 bool PersonalDataManager::IsAutofillEnabled() const {
   return ::autofill::IsAutofillEnabled(pref_service_);
 }
@@ skipping 676 matching lines @@
     std::stable_sort(suggestions.begin(), suggestions.end(),
                      [](const Suggestion& a, const Suggestion& b) {
                        return a.match < b.match;
                      });
   }
 
   return suggestions;
 }
 
 }  // namespace autofill