[WebPayments] Adding FilterProfilesForShipping to profile comparator

ios/chrome/browser/payments/payment_request.mm

 // Copyright 2017 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 "ios/chrome/browser/payments/payment_request.h"
 
 #include "base/containers/adapters.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_data_util.h"
 #include "components/autofill/core/browser/autofill_profile.h"
@@ skipping 110 matching lines @@
 }
 
 void PaymentRequest::PopulateProfileCache() {
   const std::vector<autofill::AutofillProfile*>& profiles_to_suggest =
       personal_data_manager_->GetProfilesToSuggest();
   // Return early if the user has no stored Autofill profiles.
   if (profiles_to_suggest.empty())
     return;
 
   profile_cache_.reserve(profiles_to_suggest.size());
+
+  std::vector<autofill::AutofillProfile*> raw_profiles_for_filtering;
+  raw_profiles_for_filtering.reserve(profiles_to_suggest.size());
+
   for (const auto* profile : profiles_to_suggest) {
     profile_cache_.push_back(*profile);
-    shipping_profiles_.push_back(&profile_cache_.back());
-  }
-
-  // If the merchant provided a shipping option, select a suitable default
-  // shipping profile. We pick the profile that is most complete, going down
-  // the list in Frecency order.
-  // TODO(crbug.com/719652): Have a proper ordering of shipping addresses by
-  // completeness.
-  if (selected_shipping_option_) {
-    selected_shipping_profile_ = shipping_profiles_[0];
-    for (autofill::AutofillProfile* profile : shipping_profiles_) {
-      if (profile_comparator_.IsShippingComplete(profile)) {
-        selected_shipping_profile_ = profile;
-        break;
-      }
-    }
+    raw_profiles_for_filtering.push_back(&profile_cache_.back());
   }
 
   // Contact profiles are deduped and ordered in completeness.
   contact_profiles_ =
-      profile_comparator_.FilterProfilesForContact(shipping_profiles_);
+      profile_comparator_.FilterProfilesForContact(raw_profiles_for_filtering);
+
+  // Shipping profiles are ordered by completeness.
+  shipping_profiles_ =
+      profile_comparator_.FilterProfilesForShipping(raw_profiles_for_filtering);
+
+  // If the merchant provided a shipping option, and the highest-ranking
+  // shipping profile is usable, select it.
+  if (selected_shipping_option_ && !shipping_profiles_.empty() &&
+      profile_comparator_.IsShippingComplete(shipping_profiles_[0])) {
+    selected_shipping_profile_ = shipping_profiles_[0];
+  }
 
   // If the highest-ranking contact profile is usable, select it. Otherwise,
   // select none.
   if (!contact_profiles_.empty() &&
       profile_comparator_.IsContactInfoComplete(contact_profiles_[0])) {
     selected_contact_profile_ = contact_profiles_[0];
   }
 }
 
 void PaymentRequest::PopulateCreditCardCache() {
@@ skipping 39 matching lines @@
 
   for (auto* shipping_option : base::Reversed(shipping_options_)) {
     if (shipping_option->selected) {
       // If more than one option has |selected| set, the last one in the
       // sequence should be treated as the selected item.
       selected_shipping_option_ = shipping_option;
       break;
     }
   }
 }