[Payments] Normalize shipping address change on Desktop

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 5628fadf082bc092d1a9dd21c379a2b2d38253bf..afa32130a63db2460539c8fc7a29487cc0d0cf75 100644
--- a/components/payments/content/payment_request_state.cc
+++ b/components/payments/content/payment_request_state.cc
@@ -9,11 +9,11 @@
 #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_request_spec.h"
 #include "components/payments/content/payment_response_helper.h"
 #include "components/payments/core/autofill_payment_instrument.h"
 #include "components/payments/core/payment_instrument.h"
@@ -29,6 +29,7 @@ PaymentRequestState::PaymentRequestState(
     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),
@@ -39,6 +40,7 @@ PaymentRequestState::PaymentRequestState(
       payment_request_delegate_(payment_request_delegate) {
   PopulateProfileCache();
   SetDefaultProfileSelections();
+  spec_->AddObserver(this);
 }
 PaymentRequestState::~PaymentRequestState() {}
 
@@ -47,6 +49,25 @@ void PaymentRequestState::OnPaymentResponseReady(
   delegate_->OnPaymentResponseAvailable(std::move(payment_response));
 }
 
+void PaymentRequestState::OnAddressNormalized(
+    const autofill::AutofillProfile& normalized_profile) {
+  delegate_->OnShippingAddressSelected(
+      PaymentResponseHelper::GetMojomPaymentAddressFromAutofillProfile(
+          normalized_profile, app_locale_));
+}
+
+void PaymentRequestState::OnCouldNotNormalize(
+    const autofill::AutofillProfile& profile) {
+  // Since the phone number is formatted in either case, this profile should be
+  // used.
+  OnAddressNormalized(profile);
+}
+
+void PaymentRequestState::OnSpecUpdated() {
+  is_waiting_for_merchant_validation_ = false;

[Mathieu, 2017/04/27 11:04:01]

could this be on line 54?

[sebsg, 2017/04/27 14:43:23]

Not really, as the merchant has not validated yet.

+  UpdateIsReadyToPayAndNotifyObservers();
+}
+
 bool PaymentRequestState::CanMakePayment() const {
   for (const std::unique_ptr<PaymentInstrument>& instrument :
        available_instruments_) {
@@ -133,10 +154,21 @@ void PaymentRequestState::SetSelectedShippingProfile(
   spec_->StartWaitingForUpdateWith(
       PaymentRequestSpec::UpdateReason::SHIPPING_ADDRESS);
   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;

[Mathieu, 2017/04/27 11:04:01]

another option is to set |selected_shipping_profile_| to nullptr until it's
normalized. Not sure which one I prefer...

[sebsg, 2017/04/27 14:43:23]

I thought about that but when we get the result from the normalization we get an
object, so we'd have to handle that. That's why I prefered the current way :)

   UpdateIsReadyToPayAndNotifyObservers();
-  delegate_->OnShippingAddressSelected(
-      PaymentResponseHelper::GetMojomPaymentAddressFromAutofillProfile(
-          selected_shipping_profile_, app_locale_));
+
+  // 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_);
+  payment_request_delegate_->GetAddressNormalizer()->StartAddressNormalization(
+      *selected_shipping_profile_, country_code, /*timeout_seconds=*/2, this);
 }
 
 void PaymentRequestState::SetSelectedContactProfile(
@@ -246,6 +278,9 @@ bool PaymentRequestState::ArePaymentOptionsSatisfied() {
   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_);
 }