[Web Payment] Move "is waiting" logic to payment app.

Before this patch, the desktop logic for checking whether the payment
app is waiting for a price update from the merchant was defined
in the desktop controller, which prevented from sharing this logic
across platforms and in different types of payment apps.

This patch moves PaymentHandlerHost.is_waiting() check from
payment_request.cc to service_worker_payment_app.cc.

After this patch, the logic for checking whether the payment app is
waiting for a price update is defined in the potentially cross-platform
payment app interface.

Design: https://bit.ly/cross-platform-pay-app-factory

Bug: 1083242
Change-Id: Idde2f1c9396641835f154be19ac7d2901c1c1d14
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2207973
Commit-Queue: Rouslan Solomakhin <rouslan@chromium.org>
Reviewed-by: Liquan (Max) Gu <maxlg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#771029}

components/payments/content/payment_request.cc

@@ -343,7 +343,7 @@ void PaymentRequest::UpdateWith(mojom::PaymentDetailsPtr details) {
   }
 
   if (state()->selected_app() && state()->IsPaymentAppInvoked() &&
-      payment_handler_host_.is_waiting_for_payment_details_update()) {
+      state()->selected_app()->IsWaitingForPaymentDetailsUpdate()) {
     payment_handler_host_.UpdateWith(
         PaymentDetailsConverter::ConvertToPaymentRequestDetailsUpdate(
             details, state()->selected_app()->HandlesShippingAddress(),
@@ -386,8 +386,8 @@ void PaymentRequest::OnPaymentDetailsNotUpdated() {
 
   spec_->RecomputeSpecForDetails();
 
-  if (state()->IsPaymentAppInvoked() &&
-      payment_handler_host_.is_waiting_for_payment_details_update()) {
+  if (state()->IsPaymentAppInvoked() && state()->selected_app() &&
+      state()->selected_app()->IsWaitingForPaymentDetailsUpdate()) {
     payment_handler_host_.OnPaymentDetailsNotUpdated();
   }
 }

components/payments/content/service_worker_payment_app.cc

@@ -346,7 +346,7 @@ ServiceWorkerPaymentApp::CreatePaymentRequestEventData() {
     }
   }
 
-  event_data->payment_handler_host = std::move(payment_handler_host_);
+  event_data->payment_handler_host = std::move(payment_handler_host_remote_);
 
   return event_data;
 }
@@ -552,7 +552,13 @@ ukm::SourceId ServiceWorkerPaymentApp::UkmSourceId() {
 
 void ServiceWorkerPaymentApp::SetPaymentHandlerHost(
     base::WeakPtr<PaymentHandlerHost> payment_handler_host) {
-  payment_handler_host_ = payment_handler_host->Bind();
+  payment_handler_host_ = payment_handler_host;
+  payment_handler_host_remote_ = payment_handler_host_->Bind();
+}
+
+bool ServiceWorkerPaymentApp::IsWaitingForPaymentDetailsUpdate() const {
+  return payment_handler_host_ &&
+         payment_handler_host_->is_waiting_for_payment_details_update();
 }
 
 }  // namespace payments

components/payments/content/service_worker_payment_app.h

@@ -29,6 +29,8 @@ class Origin;
 
 namespace payments {
 
+class PaymentHandlerHost;
+
 // Represents a service worker based payment app.
 class ServiceWorkerPaymentApp : public PaymentApp {
  public:
@@ -100,6 +102,7 @@ class ServiceWorkerPaymentApp : public PaymentApp {
   ukm::SourceId UkmSourceId() override;
   void SetPaymentHandlerHost(
       base::WeakPtr<PaymentHandlerHost> payment_handler_host) override;
+  bool IsWaitingForPaymentDetailsUpdate() const override;
 
  private:
   friend class ServiceWorkerPaymentAppTest;
@@ -141,7 +144,8 @@ class ServiceWorkerPaymentApp : public PaymentApp {
   // after the service worker is installed.
   IdentityCallback identity_callback_;
 
-  mojo::PendingRemote<mojom::PaymentHandlerHost> payment_handler_host_;
+  base::WeakPtr<PaymentHandlerHost> payment_handler_host_;
+  mojo::PendingRemote<mojom::PaymentHandlerHost> payment_handler_host_remote_;
 
   // PaymentAppProvider::CanMakePayment result of this payment app.
   bool can_make_payment_result_;

components/payments/core/payment_app.cc

@@ -64,6 +64,10 @@ ukm::SourceId PaymentApp::UkmSourceId() {
   return ukm::kInvalidSourceId;
 }
 
+bool PaymentApp::IsWaitingForPaymentDetailsUpdate() const {
+  return false;
+}
+
 // static
 void PaymentApp::SortApps(std::vector<std::unique_ptr<PaymentApp>>* apps) {
   DCHECK(apps);

components/payments/core/payment_app.h

@@ -120,6 +120,11 @@ class PaymentApp {
   virtual void SetPaymentHandlerHost(
       base::WeakPtr<PaymentHandlerHost> payment_handler_host) {}
 
+  // Whether the payment app is waiting for the merchant to update the purchase
+  // price based on the shipping, billing, or contact information that the user
+  // has selected inside of the payment app.
+  virtual bool IsWaitingForPaymentDetailsUpdate() const;
+
  protected:
   PaymentApp(int icon_resource_id, Type type);