[Payments] Normalize Shipping Address sent to merchant on Desktop.

components/payments/content/payment_response_helper.h

Index: components/payments/content/payment_response_helper.h
diff --git a/components/payments/content/payment_response_helper.h b/components/payments/content/payment_response_helper.h
index 69e0383799e3128f9e27f44bc68505f6e6cd37b6..1064b45f91a272ff11e553427da80bb4f0190a45 100644
--- a/components/payments/content/payment_response_helper.h
+++ b/components/payments/content/payment_response_helper.h
@@ -6,6 +6,8 @@
 #define COMPONENTS_PAYMENTS_CONTENT_PAYMENT_RESPONSE_HELPER_H_
 
 #include "base/macros.h"
+#include "components/autofill/core/browser/autofill_profile.h"
+#include "components/payments/core/address_normalizer.h"
 #include "components/payments/core/payment_instrument.h"
 #include "components/payments/mojom/payment_request.mojom.h"
 
@@ -15,12 +17,14 @@ class AutofillProfile;
 
 namespace payments {
 
+class PaymentRequestDelegate;
 class PaymentRequestSpec;
 
 // TODO(sebsg): Asynchronously normalize the billing and shipping addresses
 // before adding them to the PaymentResponse.
 // A helper class to facilitate the creation of the PaymentResponse.
-class PaymentResponseHelper : public PaymentInstrument::Delegate {
+class PaymentResponseHelper : public PaymentInstrument::Delegate,
+                              AddressNormalizer::Delegate {
  public:
   class Delegate {
    public:
@@ -34,6 +38,7 @@ class PaymentResponseHelper : public PaymentInstrument::Delegate {
   PaymentResponseHelper(const std::string& app_locale,
                         PaymentRequestSpec* spec,
                         PaymentInstrument* selected_instrument,
+                        PaymentRequestDelegate* payment_request_delegate,
                         autofill::AutofillProfile* selected_shipping_profile,
                         autofill::AutofillProfile* selected_contact_profile,
                         Delegate* delegate);
@@ -51,18 +56,34 @@ class PaymentResponseHelper : public PaymentInstrument::Delegate {
       const std::string& stringified_details) override;
   void OnInstrumentDetailsError() override {}
 
+  // AddressNormalizer::Delegate
+  void OnAddressNormalized(
+      const autofill::AutofillProfile& normalized_profile) override;
+  void OnCouldNotNormalize(const autofill::AutofillProfile& profile) override;
+
  private:
+  // Generates the Payment Response and sends it to the delegate.
+  void GeneratePaymentResponse();
+
   const std::string& app_locale_;
+  bool is_waiting_for_shipping_address_normalization_;
+  bool is_waiting_for_instrument_details_;
 
   // Not owned, cannot be null.
   PaymentRequestSpec* spec_;
   Delegate* delegate_;
   PaymentInstrument* selected_instrument_;
+  PaymentRequestDelegate* payment_request_delegate_;
 
   // Not owned, can be null (dependent on the spec).
-  autofill::AutofillProfile* selected_shipping_profile_;
   autofill::AutofillProfile* selected_contact_profile_;
 
+  autofill::AutofillProfile shipping_address_;
+
+  // Instrument Details.
+  std::string method_name_;
+  std::string stringified_details_;
+
   DISALLOW_COPY_AND_ASSIGN(PaymentResponseHelper);
 };