[WebPayments] Adding FilterProfilesForShipping to profile comparator

components/payments/core/payments_profile_comparator.cc

 // 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 "components/payments/core/payments_profile_comparator.h"
 
 #include <algorithm>
 #include <memory>
 
 #include "base/strings/utf_string_conversions.h"
@@ skipping 100 matching lines @@
       return false;
     }
     if (!HaveMergeableEmailAddresses(super, sub))
       return false;
   }
   return true;
 }
 
 int PaymentsProfileComparator::GetContactCompletenessScore(
     const autofill::AutofillProfile* profile) const {
-  if (!profile)
-    return 0;
-
   // Create a bitmask of the fields that are both present and required.
   ProfileFields present =
       ~GetMissingProfileFields(profile) & GetRequiredProfileFieldsForContact();
 
   // Count how many are set.
   return !!(present & kName) + !!(present & kPhone) + !!(present & kEmail);
 }
 
 bool PaymentsProfileComparator::IsContactInfoComplete(
     const autofill::AutofillProfile* profile) const {
   // Mask the fields that are missing with those that are requried. If any bits
   // are set (i.e., the result is nonzero), then contact info is incomplete.
   return !(GetMissingProfileFields(profile) &
            GetRequiredProfileFieldsForContact());
 }
 
 bool PaymentsProfileComparator::IsContactMoreComplete(
     const autofill::AutofillProfile* p1,
     const autofill::AutofillProfile* p2) const {
   return GetContactCompletenessScore(p1) > GetContactCompletenessScore(p2);
 }
 
 base::string16 PaymentsProfileComparator::GetStringForMissingContactFields(
     const autofill::AutofillProfile& profile) const {
   return GetStringForMissingFields(GetMissingProfileFields(&profile) &
                                    GetRequiredProfileFieldsForContact());
 }
 
+std::vector<autofill::AutofillProfile*>
+PaymentsProfileComparator::FilterProfilesForShipping(
+    const std::vector<autofill::AutofillProfile*>& profiles) const {
+  // Since we'll be changing the order/contents of the const input vector,
+  // we make a copy.
+  std::vector<autofill::AutofillProfile*> processed = profiles;
+
+  std::stable_sort(
+      processed.begin(), processed.end(),
+      std::bind(&PaymentsProfileComparator::IsShippingMoreComplete, this,
+                std::placeholders::_1, std::placeholders::_2));
+
+  // TODO(tmartino): Remove profiles with no relevant information, or which

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

TODO(crbug.com/xxxxxx) please

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

Done

+  // are subsets of more-complete profiles.
+
+  return processed;
+}
+
+int PaymentsProfileComparator::GetShippingCompletenessScore(
+    const autofill::AutofillProfile* profile) const {
+  // Create a bitmask of the fields that are both present and required.
+  ProfileFields present =
+      ~GetMissingProfileFields(profile) & GetRequiredProfileFieldsForShipping();
+
+  // Count how many are set. The completeness of the address is weighted so as
+  // to dominate the other fields.
+  return !!(present & kName) + !!(present & kPhone) +
+         (10 * !!(present & kAddress));
+}
+
 bool PaymentsProfileComparator::IsShippingComplete(
     const autofill::AutofillProfile* profile) const {
   // Mask the fields that are missing with those that are requried. If any bits
   // are set (i.e., the result is nonzero), then shipping is incomplete.
   return !(GetMissingProfileFields(profile) &
            GetRequiredProfileFieldsForShipping());
 }
 
+bool PaymentsProfileComparator::IsShippingMoreComplete(
+    const autofill::AutofillProfile* p1,
+    const autofill::AutofillProfile* p2) const {
+  return GetShippingCompletenessScore(p1) > GetShippingCompletenessScore(p2);
+}
+
 base::string16 PaymentsProfileComparator::GetStringForMissingShippingFields(
     const autofill::AutofillProfile& profile) const {
   return GetStringForMissingFields(GetMissingProfileFields(&profile) &
                                    GetRequiredProfileFieldsForShipping());
 }
 
 void PaymentsProfileComparator::Invalidate(
     const autofill::AutofillProfile& profile) {
   cache_.erase(profile.guid());
 }
@@ skipping 72 matching lines @@
 bool PaymentsProfileComparator::AreRequiredAddressFieldsPresent(
     const autofill::AutofillProfile& profile) const {
   std::unique_ptr<::i18n::addressinput::AddressData> data =
       autofill::i18n::CreateAddressDataFromAutofillProfile(profile,
                                                            app_locale());
 
   return autofill::addressinput::HasAllRequiredFields(*data);
 }
 
 }  // namespace payments