Implement request id in PaymentDetailsInit

third_party/WebKit/Source/modules/payments/PaymentRequest.cpp

 // 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 "modules/payments/PaymentRequest.h"
 
 #include <stddef.h>
 #include <utility>
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
@@ skipping 21 matching lines @@
 #include "modules/payments/PaymentAddress.h"
 #include "modules/payments/PaymentDetailsInit.h"
 #include "modules/payments/PaymentDetailsUpdate.h"
 #include "modules/payments/PaymentItem.h"
 #include "modules/payments/PaymentRequestUpdateEvent.h"
 #include "modules/payments/PaymentResponse.h"
 #include "modules/payments/PaymentShippingOption.h"
 #include "modules/payments/PaymentsValidators.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "platform/RuntimeEnabledFeatures.h"
+#include "platform/UUID.h"
 #include "platform/mojo/MojoHelper.h"
 #include "platform/wtf/HashSet.h"
 #include "public/platform/InterfaceProvider.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebTraceLocation.h"
 
 namespace {
 
 using ::payments::mojom::blink::CanMakePaymentQueryResult;
 using ::payments::mojom::blink::PaymentAddressPtr;
@@ skipping 477 matching lines @@
                                        shipping_option_output,
                                        execution_context, exception_state);
   if (exception_state.HadException())
     return;
 
   if (!input.hasTotal()) {
     exception_state.ThrowTypeError("Must specify total");
     return;
   }
 
+  if (input.hasId())
+    output->id = input.id();
+  else
+    output->id = CreateCanonicalUUIDString();
+
   ValidateAndConvertTotal(input.total(), output->total, exception_state);
 }
 
 void ValidateAndConvertPaymentDetailsUpdate(const PaymentDetailsUpdate& input,
                                             bool request_shipping,
                                             PaymentDetailsPtr& output,
                                             String& shipping_option_output,
                                             ExecutionContext& execution_context,
                                             ExceptionState& exception_state) {
   ValidateAndConvertPaymentDetailsBase(input, request_shipping, output,
@@ skipping 324 matching lines @@
   }
 
   PaymentDetailsPtr validated_details =
       payments::mojom::blink::PaymentDetails::New();
   ValidateAndConvertPaymentDetailsInit(details, options_.requestShipping(),
                                        validated_details, shipping_option_,
                                        *GetExecutionContext(), exception_state);
   if (exception_state.HadException())
     return;
 
+  id_ = validated_details->id;
+
   if (options_.requestShipping())
     shipping_type_ = GetValidShippingType(options_.shippingType());
 
   GetFrame()->GetInterfaceProvider()->GetInterface(
       mojo::MakeRequest(&payment_provider_));
   payment_provider_.set_connection_error_handler(ConvertToBaseCallback(
       WTF::Bind(&PaymentRequest::OnError, WrapWeakPersistent(this),
                 PaymentErrorReason::UNKNOWN)));
   payment_provider_->Init(
       client_binding_.CreateInterfacePtrAndBind(),
@@ skipping 75 matching lines @@
       (!options_.requestPayerName() && !response->payer_name.IsNull()) ||
       (!options_.requestPayerEmail() && !response->payer_email.IsNull()) ||
       (!options_.requestPayerPhone() && !response->payer_phone.IsNull())) {
     show_resolver_->Reject(DOMException::Create(kSyntaxError));
     ClearResolversAndCloseMojoConnection();
     return;
   }
 
   complete_timer_.StartOneShot(kCompleteTimeoutSeconds, BLINK_FROM_HERE);
 
-  show_resolver_->Resolve(new PaymentResponse(std::move(response), this));
+  show_resolver_->Resolve(new PaymentResponse(std::move(response), this, id_));
 
   // Do not close the mojo connection here. The merchant website should call
   // PaymentResponse::complete(String), which will be forwarded over the mojo
   // connection to display a success or failure message to the user.
   show_resolver_.Clear();
 }
 
 void PaymentRequest::OnError(PaymentErrorReason error) {
   ExceptionCode ec = kUnknownError;
   String message;
@@ skipping 91 matching lines @@
   complete_resolver_.Clear();
   show_resolver_.Clear();
   abort_resolver_.Clear();
   can_make_payment_resolver_.Clear();
   if (client_binding_.is_bound())
     client_binding_.Close();
   payment_provider_.reset();
 }
 
 }  // namespace blink