[Web Payments] Add Spinners and timeout while waiting for UpdateWith

components/payments/content/payment_request.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.h"
 
 #include <string>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "components/payments/content/payment_details_validation.h"
 #include "components/payments/content/payment_request_web_contents_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 
 namespace payments {
+namespace {
+// When waiting for an UpdateWith call, timeout after 60 seconds.
+constexpr int kTimeoutDuration = 60;
+}  // namespace
 
 PaymentRequest::PaymentRequest(
     content::WebContents* web_contents,
     std::unique_ptr<PaymentRequestDelegate> delegate,
     PaymentRequestWebContentsManager* manager,
     mojo::InterfaceRequest<payments::mojom::PaymentRequest> request,
     ObserverForTest* observer_for_testing)
     : web_contents_(web_contents),
       delegate_(std::move(delegate)),
       manager_(manager),
@@ skipping 45 matching lines @@
   delegate_->ShowDialog(this);
 }
 
 void PaymentRequest::UpdateWith(mojom::PaymentDetailsPtr details) {
   std::string error;
   if (!payments::validatePaymentDetails(details, &error)) {
     LOG(ERROR) << error;
     OnConnectionTerminated();
     return;
   }
+  wait_timer_.Stop();
   spec_->UpdateWith(std::move(details));
 }
 
 void PaymentRequest::Abort() {
   // The API user has decided to abort. We return a successful abort message to
   // the renderer, which closes the Mojo message pipe, which triggers
   // PaymentRequest::OnConnectionTerminated, which destroys this object.
   if (client_.is_bound())
     client_->OnAbort(true /* aborted_successfully */);
 }
@@ skipping 26 matching lines @@
   OnConnectionTerminated();
 }
 
 void PaymentRequest::OnPaymentResponseAvailable(
     mojom::PaymentResponsePtr response) {
   client_->OnPaymentResponse(std::move(response));
 }
 
 void PaymentRequest::OnShippingOptionIdSelected(
     std::string shipping_option_id) {
+  // TODO(anthonyvd): display an error before terminating the connection.
+  wait_timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(kTimeoutDuration),
+                    this, &PaymentRequest::OnConnectionTerminated);
+  spec_->StartWaitingForUpdateWith(
+      PaymentRequestSpec::UpdateReason::SHIPPING_OPTION);
   client_->OnShippingOptionChange(shipping_option_id);
 }
 
 void PaymentRequest::OnShippingAddressSelected(
     mojom::PaymentAddressPtr address) {
+  // TODO(anthonyvd): display an error before terminating the connection.
+  wait_timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(kTimeoutDuration),
+                    this, &PaymentRequest::OnConnectionTerminated);
+  spec_->StartWaitingForUpdateWith(
+      PaymentRequestSpec::UpdateReason::SHIPPING_ADDRESS);
   client_->OnShippingAddressChange(std::move(address));
 }
 
 void PaymentRequest::UserCancelled() {
   // If |client_| is not bound, then the object is already being destroyed as
   // a result of a renderer event.
   if (!client_.is_bound())
     return;
 
   // This sends an error to the renderer, which informs the API user.
@@ skipping 15 matching lines @@
   binding_.Close();
   delegate_->CloseDialog();
   manager_->DestroyRequest(this);
 }
 
 void PaymentRequest::Pay() {
   state_->GeneratePaymentResponse();
 }
 
 }  // namespace payments