[WebPayments] Adding FilterProfilesForShipping to profile comparator

components/payments/content/payment_request_state.cc

Index: components/payments/content/payment_request_state.cc
diff --git a/components/payments/content/payment_request_state.cc b/components/payments/content/payment_request_state.cc
index 12e57cfd8945997420923077fe90fdb414a72ff8..350cccf6035ceaba89bc19b3389eae9369ee8654 100644
--- a/components/payments/content/payment_request_state.cc
+++ b/components/payments/content/payment_request_state.cc
@@ -238,26 +238,22 @@ void PaymentRequestState::PopulateProfileCache() {
   std::vector<autofill::AutofillProfile*> profiles =
       personal_data_manager_->GetProfilesToSuggest();
 
+  std::vector<autofill::AutofillProfile*> raw_profiles_for_filtering;
+  raw_profiles_for_filtering.reserve(profiles.size());
+
   // PaymentRequest may outlive the Profiles returned by the Data Manager.
   // Thus, we store copies, and return a vector of pointers to these copies
   // whenever Profiles are requested.
   for (size_t i = 0; i < profiles.size(); i++) {
     profile_cache_.push_back(
         base::MakeUnique<autofill::AutofillProfile>(*profiles[i]));
-
-    shipping_profiles_.push_back(profile_cache_[i].get());
+    raw_profiles_for_filtering.push_back(profile_cache_.back().get());
   }
 
-  std::vector<autofill::AutofillProfile*> raw_profiles_for_filtering(
-      profile_cache_.size());
-  std::transform(profile_cache_.begin(), profile_cache_.end(),
-                 raw_profiles_for_filtering.begin(),
-                 [](const std::unique_ptr<autofill::AutofillProfile>& p) {
-                   return p.get();
-                 });
-
   contact_profiles_ = profile_comparator()->FilterProfilesForContact(
       raw_profiles_for_filtering);
+  shipping_profiles_ = profile_comparator()->FilterProfilesForShipping(
+      raw_profiles_for_filtering);
 
   // Create the list of available instruments. A copy of each card will be made
   // by their respective AutofillPaymentInstrument.
@@ -269,22 +265,17 @@ void PaymentRequestState::PopulateProfileCache() {
 
 void PaymentRequestState::SetDefaultProfileSelections() {
   // Only pre-select an address if the merchant provided at least one selected
-  // shipping option.
-  if (!shipping_profiles().empty() && spec_->selected_shipping_option()) {
-    // Choose any complete shipping profile, or default to the most frecent
-    // address if no complete address could be found.
-    selected_shipping_profile_ = shipping_profiles_[0];
-    for (autofill::AutofillProfile* profile : shipping_profiles_) {
-      if (profile_comparator_.IsShippingComplete(profile)) {
-        selected_shipping_profile_ = profile;
-        break;
-      }
-    }
+  // shipping option, and the top profile is complete. Assumes that profiles
+  // have already been sorted for completeness and frecency.
+  if (!shipping_profiles().empty() && spec_->selected_shipping_option() &&
+      profile_comparator()->IsShippingComplete(shipping_profiles_[0])) {
+    selected_shipping_profile_ = shipping_profiles()[0];
   }
 
   // Contact profiles were ordered by completeness in addition to frecency;
   // the first one is the best default selection.
-  if (!contact_profiles().empty())
+  if (!contact_profiles().empty() &&
+      profile_comparator()->IsContactInfoComplete(contact_profiles_[0]))
     selected_contact_profile_ = contact_profiles()[0];
 
   // TODO(crbug.com/702063): Change this code to prioritize instruments by use