[WebPayments] Adding FilterProfilesForShipping to profile comparator

components/payments/content/payment_request_state.cc

 // Copyright 2016 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/payments/content/payment_request_state.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 210 matching lines @@
 void PaymentRequestState::PopulateProfileCache() {
   std::vector<autofill::AutofillProfile*> profiles =
       personal_data_manager_->GetProfilesToSuggest();
 
   // 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());
   }
 
   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(

[Mathieu, 2017/05/16 20:16:51]

can you also call this in payment_request.mm
(https://cs.chromium.org/chromium/src/ios/chrome/browser/payments/payment_requ...)
and address the TODO on line 139 over there?

Thanks

[tmartino, 2017/05/18 20:49:36]

Done

+      raw_profiles_for_filtering);
 
   // Create the list of available instruments. A copy of each card will be made
   // by their respective AutofillPaymentInstrument.
   const std::vector<autofill::CreditCard*>& cards =
       personal_data_manager_->GetCreditCardsToSuggest();
   for (autofill::CreditCard* card : cards)
     AddAutofillPaymentInstrument(/*selected=*/false, *card);
 }
 
 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_) {

[Mathieu, 2017/05/16 20:16:51]

can you remove this code? I think we should be good with line 260 now?

[tmartino, 2017/05/18 20:49:37]

Done

       if (profile_comparator_.IsShippingComplete(profile)) {
         selected_shipping_profile_ = profile;
         break;
       }
     }
   }
 
   // Contact profiles were ordered by completeness in addition to frecency;
   // the first one is the best default selection.
   if (!contact_profiles().empty())
@@ skipping 37 matching lines @@
   if (is_waiting_for_merchant_validation_)
     return false;
 
   if (!profile_comparator()->IsShippingComplete(selected_shipping_profile_))
     return false;
 
   return profile_comparator()->IsContactInfoComplete(selected_contact_profile_);
 }
 
 }  // namespace payments