[WebPayments] Show labels on incomplete profiles

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>
 
 #include "base/strings/utf_string_conversions.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "components/autofill/core/browser/autofill_data_util.h"
 #include "components/autofill/core/browser/autofill_profile.h"
 #include "components/autofill/core/browser/credit_card.h"
 #include "components/autofill/core/browser/personal_data_manager.h"
 #include "components/payments/content/payment_response_helper.h"
 #include "components/payments/core/autofill_payment_instrument.h"
 #include "components/payments/core/payment_instrument.h"
 #include "components/payments/core/payment_request_delegate.h"
-#include "components/payments/core/profile_util.h"
 
 namespace payments {
 
 PaymentRequestState::PaymentRequestState(
     PaymentRequestSpec* spec,
     Delegate* delegate,
     const std::string& app_locale,
     autofill::PersonalDataManager* personal_data_manager,
     PaymentRequestDelegate* payment_request_delegate)
     : is_ready_to_pay_(false),
       is_waiting_for_merchant_validation_(false),
       app_locale_(app_locale),
       spec_(spec),
       delegate_(delegate),
       personal_data_manager_(personal_data_manager),
       selected_shipping_profile_(nullptr),
       selected_contact_profile_(nullptr),
       selected_instrument_(nullptr),
-      payment_request_delegate_(payment_request_delegate) {
+      payment_request_delegate_(payment_request_delegate),
+      profile_comparator_(app_locale, *spec) {
   PopulateProfileCache();
   SetDefaultProfileSelections();
   spec_->AddObserver(this);
 }
 PaymentRequestState::~PaymentRequestState() {}
 
 void PaymentRequestState::OnPaymentResponseReady(
     mojom::PaymentResponsePtr payment_response) {
   delegate_->OnPaymentResponseAvailable(std::move(payment_response));
 }
@@ skipping 105 matching lines @@
   selected_shipping_profile_ = profile;
 
   // The user should not be able to click on pay until the callback from the
   // merchant.
   is_waiting_for_merchant_validation_ = true;
   UpdateIsReadyToPayAndNotifyObservers();
 
   // Start the normalization of the shipping address.
   // Use the country code from the profile if it is set, otherwise infer it
   // from the |app_locale_|.
-  std::string country_code = base::UTF16ToUTF8(
-      selected_shipping_profile_->GetRawInfo(autofill::ADDRESS_HOME_COUNTRY));
-  if (!autofill::data_util::IsValidCountryCode(country_code))
-    country_code = autofill::AutofillCountry::CountryCodeForLocale(app_locale_);
+  std::string country_code = data_util::GetCountryCodeWithFallback(
+      selected_shipping_profile_, app_locale_);
   payment_request_delegate_->GetAddressNormalizer()->StartAddressNormalization(
       *selected_shipping_profile_, country_code, /*timeout_seconds=*/2, this);
 }
 
 void PaymentRequestState::SetSelectedContactProfile(
     autofill::AutofillProfile* profile) {
   selected_contact_profile_ = profile;
   UpdateIsReadyToPayAndNotifyObservers();
 }
 
@@ skipping 31 matching lines @@
   }
 
   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_util::FilterProfilesForContact(
-      raw_profiles_for_filtering, GetApplicationLocale(), *spec_);
+  contact_profiles_ = profile_comparator()->FilterProfilesForContact(
+      raw_profiles_for_filtering);
 
   // Create the list of available instruments.
   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
@@ skipping 34 matching lines @@
 }
 
 bool PaymentRequestState::ArePaymentDetailsSatisfied() {
   // There is no need to check for supported networks, because only supported
   // instruments are listed/created in the flow.
   return selected_instrument_ != nullptr &&
          selected_instrument_->IsCompleteForPayment();
 }
 
 bool PaymentRequestState::ArePaymentOptionsSatisfied() {
-  // TODO(mathp): Have a measure of shipping address completeness.
-  if (spec_->request_shipping() && selected_shipping_profile_ == nullptr)
-    return false;
-
   if (is_waiting_for_merchant_validation_)
     return false;
 
-  profile_util::PaymentsProfileComparator comparator(app_locale_, *spec_);
-  return comparator.IsContactInfoComplete(selected_contact_profile_);
+  if (!profile_comparator()->IsShippingComplete(selected_shipping_profile_))
+    return false;
+
+  return profile_comparator()->IsContactInfoComplete(selected_contact_profile_);
 }
 
 }  // namespace payments