[Payments] Normalize shipping address change on Desktop

components/payments/content/payment_request_state.h

 // 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.
 
 #ifndef COMPONENTS_PAYMENTS_CONTENT_PAYMENT_REQUEST_STATE_H_
 #define COMPONENTS_PAYMENTS_CONTENT_PAYMENT_REQUEST_STATE_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/observer_list.h"
+#include "components/payments/content/payment_request_spec.h"
 #include "components/payments/content/payment_response_helper.h"
+#include "components/payments/core/address_normalizer.h"
 #include "components/payments/mojom/payment_request.mojom.h"
 
 namespace autofill {
 class AutofillProfile;
 class CreditCard;
 class PersonalDataManager;
 class RegionDataLoader;
 }  // namespace autofill
 
 namespace payments {
 
 class PaymentInstrument;
 class PaymentRequestDelegate;
-class PaymentRequestSpec;
 
 // Keeps track of the information currently selected by the user and whether the
 // user is ready to pay. Uses information from the PaymentRequestSpec, which is
 // what the merchant has specified, as input into the "is ready to pay"
 // computation.
-class PaymentRequestState : public PaymentResponseHelper::Delegate {
+class PaymentRequestState : public PaymentResponseHelper::Delegate,
+                            public AddressNormalizer::Delegate,
+                            public PaymentRequestSpec::Observer {
  public:
   // Any class call add itself as Observer via AddObserver() and receive
   // notification about the state changing.
   class Observer {
    public:
     // Called when the information (payment method, address/contact info,
     // shipping option) changes.
     virtual void OnSelectedInformationChanged() = 0;
 
    protected:
@@ skipping 21 matching lines @@
                       Delegate* delegate,
                       const std::string& app_locale,
                       autofill::PersonalDataManager* personal_data_manager,
                       PaymentRequestDelegate* payment_request_delegate);
   ~PaymentRequestState() override;
 
   // PaymentResponseHelper::Delegate
   void OnPaymentResponseReady(
       mojom::PaymentResponsePtr payment_response) override;
 
+  // AddressNormalizer::Delegate
+  void OnAddressNormalized(
+      const autofill::AutofillProfile& normalized_profile) override;
+  void OnCouldNotNormalize(const autofill::AutofillProfile& profile) override;
+
+  // PaymentRequestSpec::Observer
+  void OnStartUpdating(PaymentRequestSpec::UpdateReason reason) override {}
+  void OnSpecUpdated() override;
+
   // Returns whether the user has at least one instrument that satisfies the
   // specified supported payment methods.
   bool CanMakePayment() const;
 
   // Returns true if the payment methods that the merchant website have
   // requested are supported. For example, may return true for "basic-card", but
   // false for "https://bobpay.com".
   bool AreRequestedMethodsSupported() const;
 
   void AddObserver(Observer* observer);
@@ skipping 79 matching lines @@
 
   // Returns whether the selected data satisfies the PaymentDetails requirements
   // (payment methods).
   bool ArePaymentDetailsSatisfied();
   // Returns whether the selected data satisfies the PaymentOptions requirements
   // (contact info, shipping address).
   bool ArePaymentOptionsSatisfied();
 
   bool is_ready_to_pay_;
 
+  // Whether the data is currently being validated by the merchant.
+  bool is_waiting_for_merchant_validation_;
+
   const std::string app_locale_;
 
   // Not owned. Never null. Both outlive this object.
   PaymentRequestSpec* spec_;
   Delegate* delegate_;
   autofill::PersonalDataManager* personal_data_manager_;
 
   autofill::AutofillProfile* selected_shipping_profile_;
   autofill::AutofillProfile* selected_contact_profile_;
   PaymentInstrument* selected_instrument_;
@@ skipping 12 matching lines @@
   std::unique_ptr<PaymentResponseHelper> response_helper_;
 
   base::ObserverList<Observer> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PaymentRequestState);
 };
 
 }  // namespace payments
 
 #endif  // COMPONENTS_PAYMENTS_CONTENT_PAYMENT_REQUEST_STATE_H_