[Payments] Normalize shipping address change on Desktop

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_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"
 #include "components/payments/core/payment_request_delegate.h"
 #include "components/payments/core/profile_util.h"
@@ skipping 18 matching lines @@
   PopulateProfileCache();
   SetDefaultProfileSelections();
 }
 PaymentRequestState::~PaymentRequestState() {}
 
 void PaymentRequestState::OnPaymentResponseReady(
     mojom::PaymentResponsePtr payment_response) {
   delegate_->OnPaymentResponseAvailable(std::move(payment_response));
 }
 
+void PaymentRequestState::OnAddressNormalized(
+    const autofill::AutofillProfile& normalized_profile) {
+  UpdateIsReadyToPayAndNotifyObservers();

[Mathieu, 2017/04/26 13:09:49]

what could have changed that may affect "is ready to pay"? It's possibly even a
bug to call it in this flow, because the flow is:

Select an address
StartWaitingForUpdateWith (spinner)
Start normalization
Get normalization result
Send address to merchant
Get new details back
Stop spinning.

I would say the Pay button should be updated after all this flow, what do you
think? Can you test this flow?

[sebsg, 2017/04/26 19:28:53]

I made a bunch of changes to this logic, to make sure that the Pay button is
disabled until we got the details back from the merchant.

+  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);
+}
+
 bool PaymentRequestState::CanMakePayment() const {
   for (const std::unique_ptr<PaymentInstrument>& instrument :
        available_instruments_) {
     if (instrument->IsValidForCanMakePayment()) {
       // AddAutofillPaymentInstrument() filters out available instruments based
       // on supported card networks.
       DCHECK(spec_->supported_card_networks_set().find(
                  instrument->method_name()) !=
              spec_->supported_card_networks_set().end());
       return true;
@@ skipping 66 matching lines @@
   // This will inform the merchant and will lead to them calling updateWith with
   // new PaymentDetails.
   delegate_->OnShippingOptionIdSelected(shipping_option_id);
 }
 
 void PaymentRequestState::SetSelectedShippingProfile(
     autofill::AutofillProfile* profile) {
   spec_->StartWaitingForUpdateWith(
       PaymentRequestSpec::UpdateReason::SHIPPING_ADDRESS);
   selected_shipping_profile_ = profile;
-  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)) {

[Mathieu, 2017/04/26 13:09:49]

no curlies

[sebsg, 2017/04/26 19:28:53]

Done.

+    country_code = autofill::AutofillCountry::CountryCodeForLocale(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();
 }
 
 void PaymentRequestState::SetSelectedInstrument(PaymentInstrument* instrument) {
   selected_instrument_ = instrument;
@@ skipping 94 matching lines @@
 bool PaymentRequestState::ArePaymentOptionsSatisfied() {
   // TODO(mathp): Have a measure of shipping address completeness.
   if (spec_->request_shipping() && selected_shipping_profile_ == nullptr)
     return false;
 
   profile_util::PaymentsProfileComparator comparator(app_locale_, *spec_);
   return comparator.IsContactInfoComplete(selected_contact_profile_);
 }
 
 }  // namespace payments