summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/modules/payments/payment_event_data_conversion_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/blink/renderer/modules/payments/payment_event_data_conversion_test.cc')
-rw-r--r--chromium/third_party/blink/renderer/modules/payments/payment_event_data_conversion_test.cc33
1 files changed, 7 insertions, 26 deletions
diff --git a/chromium/third_party/blink/renderer/modules/payments/payment_event_data_conversion_test.cc b/chromium/third_party/blink/renderer/modules/payments/payment_event_data_conversion_test.cc
index a01e3ecb077..3f0109f72f1 100644
--- a/chromium/third_party/blink/renderer/modules/payments/payment_event_data_conversion_test.cc
+++ b/chromium/third_party/blink/renderer/modules/payments/payment_event_data_conversion_test.cc
@@ -24,8 +24,7 @@ static WebPaymentCurrencyAmount CreateWebPaymentCurrencyAmountForTest() {
static WebPaymentMethodData CreateWebPaymentMethodDataForTest() {
WebPaymentMethodData web_method_data;
- WebString method = WebString::FromUTF8("foo");
- web_method_data.supported_methods = WebVector<WebString>(&method, 1);
+ web_method_data.supported_method = "foo";
web_method_data.stringified_data = "{\"merchantId\":\"12345\"}";
return web_method_data;
}
@@ -69,20 +68,11 @@ TEST(PaymentEventDataConversionTest, ToCanMakePaymentEventData) {
ASSERT_TRUE(data.hasMethodData());
ASSERT_EQ(1UL, data.methodData().size());
- ASSERT_TRUE(data.methodData().front().hasSupportedMethods());
- ASSERT_EQ(1UL, data.methodData()
- .front()
- .supportedMethods()
- .GetAsStringSequence()
- .size());
- ASSERT_EQ("foo", data.methodData()
- .front()
- .supportedMethods()
- .GetAsStringSequence()
- .front());
+ ASSERT_TRUE(data.methodData().front().hasSupportedMethod());
+ ASSERT_EQ("foo", data.methodData().front().supportedMethod());
ASSERT_TRUE(data.methodData().front().hasData());
ASSERT_TRUE(data.methodData().front().data().IsObject());
- String stringified_data = V8StringToWebCoreString<String>(
+ String stringified_data = ToBlinkString<String>(
v8::JSON::Stringify(
scope.GetContext(),
data.methodData().front().data().V8Value().As<v8::Object>())
@@ -110,20 +100,11 @@ TEST(PaymentEventDataConversionTest, ToPaymentRequestEventData) {
ASSERT_TRUE(data.hasMethodData());
ASSERT_EQ(1UL, data.methodData().size());
- ASSERT_TRUE(data.methodData().front().hasSupportedMethods());
- ASSERT_EQ(1UL, data.methodData()
- .front()
- .supportedMethods()
- .GetAsStringSequence()
- .size());
- ASSERT_EQ("foo", data.methodData()
- .front()
- .supportedMethods()
- .GetAsStringSequence()
- .front());
+ ASSERT_TRUE(data.methodData().front().hasSupportedMethod());
+ ASSERT_EQ("foo", data.methodData().front().supportedMethod());
ASSERT_TRUE(data.methodData().front().hasData());
ASSERT_TRUE(data.methodData().front().data().IsObject());
- String stringified_data = V8StringToWebCoreString<String>(
+ String stringified_data = ToBlinkString<String>(
v8::JSON::Stringify(
scope.GetContext(),
data.methodData().front().data().V8Value().As<v8::Object>())