Revert of [Autofill] Sort profiles and credit cards by frecency in PaymentRequest.

components/autofill/core/browser/personal_data_manager.cc

Index: components/autofill/core/browser/personal_data_manager.cc
diff --git a/components/autofill/core/browser/personal_data_manager.cc b/components/autofill/core/browser/personal_data_manager.cc
index e34ed7016465788810b5cb79c4181f76d220f7a9..127a1cbaf3e2cc18720fd212404da80fd033333d 100644
--- a/components/autofill/core/browser/personal_data_manager.cc
+++ b/components/autofill/core/browser/personal_data_manager.cc
@@ -691,8 +691,17 @@
   LoadCreditCards();
 }
 
-const std::vector<AutofillProfile*> PersonalDataManager::GetProfilesToSuggest()
-    const {
+std::vector<Suggestion> PersonalDataManager::GetProfileSuggestions(
+    const AutofillType& type,
+    const base::string16& field_contents,
+    bool field_is_autofilled,
+    const std::vector<ServerFieldType>& other_field_types) {
+  if (IsInAutofillSuggestionsDisabledExperiment())
+    return std::vector<Suggestion>();
+
+  base::string16 field_contents_canon =
+      AutofillProfile::CanonicalizeProfileString(field_contents);
+
   std::vector<AutofillProfile*> profiles = GetProfiles(true);
 
   // Rank the suggestions by frecency (see AutofillDataModel for details).
@@ -702,23 +711,6 @@
                               const AutofillDataModel* b) {
               return a->CompareFrecency(b, comparison_time);
             });
-
-  return profiles;
-}
-
-std::vector<Suggestion> PersonalDataManager::GetProfileSuggestions(
-    const AutofillType& type,
-    const base::string16& field_contents,
-    bool field_is_autofilled,
-    const std::vector<ServerFieldType>& other_field_types) {
-  if (IsInAutofillSuggestionsDisabledExperiment())
-    return std::vector<Suggestion>();
-
-  base::string16 field_contents_canon =
-      AutofillProfile::CanonicalizeProfileString(field_contents);
-
-  // Get the profiles to suggest, which are already sorted.
-  std::vector<AutofillProfile*> profiles = GetProfilesToSuggest();
 
   std::vector<Suggestion> suggestions;
   // Match based on a prefix search.
@@ -803,44 +795,31 @@
   return unique_suggestions;
 }
 
-// TODO(crbug.com/613187): Investigate if it would be more efficient to dedupe
-// with a vector instead of a list.
-const std::vector<CreditCard*> PersonalDataManager::GetCreditCardsToSuggest()
-    const {
-  std::vector<CreditCard*> credit_cards = GetCreditCards();
-
-  std::list<CreditCard*> cards_to_dedupe(credit_cards.begin(),
-                                         credit_cards.end());
-
-  DedupeCreditCardToSuggest(&cards_to_dedupe);
-
-  std::vector<CreditCard*> cards_to_suggest(
-      std::make_move_iterator(std::begin(cards_to_dedupe)),
-      std::make_move_iterator(std::end(cards_to_dedupe)));
-
-  // 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();
-  std::stable_sort(cards_to_suggest.begin(), cards_to_suggest.end(),
-                   [comparison_time](const CreditCard* a, const CreditCard* b) {
-                     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 cards_to_suggest;
-}
-
 std::vector<Suggestion> PersonalDataManager::GetCreditCardSuggestions(
     const AutofillType& type,
     const base::string16& field_contents) {
   if (IsInAutofillSuggestionsDisabledExperiment())
     return std::vector<Suggestion>();
 
-  return GetSuggestionsForCards(type, field_contents,
-                                GetCreditCardsToSuggest());
+  const std::vector<CreditCard*> credit_cards = GetCreditCards();
+  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_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 {
@@ -988,7 +967,7 @@
 
 // static
 void PersonalDataManager::DedupeCreditCardToSuggest(
-    std::list<CreditCard*>* cards_to_suggest) {
+    std::list<const CreditCard*>* cards_to_suggest) {
   for (auto outer_it = cards_to_suggest->begin();
        outer_it != cards_to_suggest->end(); ++outer_it) {
     // If considering a full server card, look for local cards that are
@@ -1472,8 +1451,9 @@
 std::vector<Suggestion> PersonalDataManager::GetSuggestionsForCards(
     const AutofillType& type,
     const base::string16& field_contents,
-    const std::vector<CreditCard*>& cards_to_suggest) const {
+    const std::list<const CreditCard*>& cards_to_suggest) const {
   std::vector<Suggestion> suggestions;
+  std::list<const CreditCard*> substring_matched_cards;
   base::string16 field_contents_lower = base::i18n::ToLower(field_contents);
   for (const CreditCard* credit_card : cards_to_suggest) {
     // The value of the stored data for this field type in the |credit_card|.