1 files changed, 15 insertions, 6 deletions

diff --git a/chromium/third_party/blink/renderer/modules/payments/secure_payment_confirmation_type_converter.cc b/chromium/third_party/blink/renderer/modules/payments/secure_payment_confirmation_type_converter.cc
index 8056093fd67..15fd339041b 100644
--- a/chromium/third_party/blink/renderer/modules/payments/secure_payment_confirmation_type_converter.cc
+++ b/chromium/third_party/blink/renderer/modules/payments/secure_payment_confirmation_type_converter.cc
@@ -4,23 +4,28 @@
 
 #include "third_party/blink/renderer/modules/payments/secure_payment_confirmation_type_converter.h"
 
-#include <stdint.h>
+#include <cstdint>
 
 #include "base/time/time.h"
-#include "third_party/blink/renderer/bindings/core/v8/array_buffer_or_array_buffer_view.h"
+#include "third_party/blink/renderer/bindings/core/v8/v8_union_arraybuffer_arraybufferview.h"
+#include "third_party/blink/renderer/bindings/modules/v8/v8_payment_credential_instrument.h"
 #include "third_party/blink/renderer/modules/credentialmanager/credential_manager_type_converters.h"
+#include "third_party/blink/renderer/platform/runtime_enabled_features.h"
+#include "third_party/blink/renderer/platform/weborigin/kurl.h"
 #include "third_party/blink/renderer/platform/wtf/vector.h"
 
 namespace mojo {
 
 template <>
 struct TypeConverter<Vector<Vector<uint8_t>>,
-                     blink::HeapVector<blink::ArrayBufferOrArrayBufferView>> {
+                     blink::HeapVector<blink::Member<
+                         blink::V8UnionArrayBufferOrArrayBufferView>>> {
   static Vector<Vector<uint8_t>> Convert(
-      const blink::HeapVector<blink::ArrayBufferOrArrayBufferView>& input) {
+      const blink::HeapVector<
+          blink::Member<blink::V8UnionArrayBufferOrArrayBufferView>>& input) {
     Vector<Vector<uint8_t>> result;
     for (const auto& item : input) {
-      result.push_back(mojo::ConvertTo<Vector<uint8_t>>(item));
+      result.push_back(mojo::ConvertTo<Vector<uint8_t>>(item.Get()));
     }
     return result;
   }
@@ -33,13 +38,17 @@ TypeConverter<payments::mojom::blink::SecurePaymentConfirmationRequestPtr,
   auto output = payments::mojom::blink::SecurePaymentConfirmationRequest::New();
   output->credential_ids =
       mojo::ConvertTo<Vector<Vector<uint8_t>>>(input->credentialIds());
-  output->network_data = mojo::ConvertTo<Vector<uint8_t>>(input->networkData());
+  output->challenge = mojo::ConvertTo<Vector<uint8_t>>(input->challenge());
 
   // If a timeout was not specified in JavaScript, then pass a null `timeout`
   // through mojo IPC, so the browser can set a default (e.g., 3 minutes).
   if (input->hasTimeout())
     output->timeout = base::TimeDelta::FromMilliseconds(input->timeout());
 
+  output->instrument = payments::mojom::blink::PaymentCredentialInstrument::New(
+      input->instrument()->displayName(),
+      blink::KURL(input->instrument()->icon()));
+
   return output;
 }