Index: third_party/WebKit/Source/modules/payments/CompleteTest.cpp |
diff --git a/third_party/WebKit/Source/modules/payments/CompleteTest.cpp b/third_party/WebKit/Source/modules/payments/CompleteTest.cpp |
index 49b598bef69f3b7cc54a38acf4adfde18667cc98..bf6044fcc9396fb32492d36d0f79791a0f827443 100644 |
--- a/third_party/WebKit/Source/modules/payments/CompleteTest.cpp |
+++ b/third_party/WebKit/Source/modules/payments/CompleteTest.cpp |
@@ -17,15 +17,15 @@ TEST(CompleteTest, CannotCallCompleteTwice) { |
PaymentRequestMockFunctionScope funcs(scope.getScriptState()); |
makePaymentRequestOriginSecure(scope.document()); |
PaymentRequest* request = PaymentRequest::create( |
- scope.document(), buildPaymentMethodDataForTest(), |
+ scope.getScriptState(), buildPaymentMethodDataForTest(), |
buildPaymentDetailsForTest(), scope.getExceptionState()); |
EXPECT_FALSE(scope.getExceptionState().hadException()); |
- request->show(scope.getScriptState()); |
+ request->show(); |
static_cast<payments::mojom::blink::PaymentRequestClient*>(request) |
->OnPaymentResponse(buildPaymentResponseForTest()); |
- request->complete(scope.getScriptState(), PaymentCompleter::Fail); |
+ request->complete(PaymentCompleter::Fail); |
- request->complete(scope.getScriptState(), PaymentCompleter::Success) |
+ request->complete(PaymentCompleter::Success) |
.then(funcs.expectNoCall(), funcs.expectCall()); |
} |
@@ -34,15 +34,15 @@ TEST(CompleteTest, RejectCompletePromiseOnError) { |
PaymentRequestMockFunctionScope funcs(scope.getScriptState()); |
makePaymentRequestOriginSecure(scope.document()); |
PaymentRequest* request = PaymentRequest::create( |
- scope.document(), buildPaymentMethodDataForTest(), |
+ scope.getScriptState(), buildPaymentMethodDataForTest(), |
buildPaymentDetailsForTest(), scope.getExceptionState()); |
EXPECT_FALSE(scope.getExceptionState().hadException()); |
- request->show(scope.getScriptState()); |
+ request->show(); |
static_cast<payments::mojom::blink::PaymentRequestClient*>(request) |
->OnPaymentResponse(buildPaymentResponseForTest()); |
String errorMessage; |
- request->complete(scope.getScriptState(), PaymentCompleter::Success) |
+ request->complete(PaymentCompleter::Success) |
.then(funcs.expectNoCall(), funcs.expectCall(&errorMessage)); |
static_cast<payments::mojom::blink::PaymentRequestClient*>(request)->OnError( |
@@ -59,16 +59,16 @@ TEST(CompleteTest, RejectCompletePromiseAfterError) { |
PaymentRequestMockFunctionScope funcs(scope.getScriptState()); |
makePaymentRequestOriginSecure(scope.document()); |
PaymentRequest* request = PaymentRequest::create( |
- scope.document(), buildPaymentMethodDataForTest(), |
+ scope.getScriptState(), buildPaymentMethodDataForTest(), |
buildPaymentDetailsForTest(), scope.getExceptionState()); |
EXPECT_FALSE(scope.getExceptionState().hadException()); |
- request->show(scope.getScriptState()); |
+ request->show(); |
static_cast<payments::mojom::blink::PaymentRequestClient*>(request) |
->OnPaymentResponse(buildPaymentResponseForTest()); |
static_cast<payments::mojom::blink::PaymentRequestClient*>(request)->OnError( |
payments::mojom::blink::PaymentErrorReason::USER_CANCEL); |
- request->complete(scope.getScriptState(), PaymentCompleter::Success) |
+ request->complete(PaymentCompleter::Success) |
.then(funcs.expectNoCall(), funcs.expectCall()); |
} |
@@ -77,14 +77,14 @@ TEST(CompleteTest, ResolvePromiseOnComplete) { |
PaymentRequestMockFunctionScope funcs(scope.getScriptState()); |
makePaymentRequestOriginSecure(scope.document()); |
PaymentRequest* request = PaymentRequest::create( |
- scope.document(), buildPaymentMethodDataForTest(), |
+ scope.getScriptState(), buildPaymentMethodDataForTest(), |
buildPaymentDetailsForTest(), scope.getExceptionState()); |
EXPECT_FALSE(scope.getExceptionState().hadException()); |
- request->show(scope.getScriptState()); |
+ request->show(); |
static_cast<payments::mojom::blink::PaymentRequestClient*>(request) |
->OnPaymentResponse(buildPaymentResponseForTest()); |
- request->complete(scope.getScriptState(), PaymentCompleter::Success) |
+ request->complete(PaymentCompleter::Success) |
.then(funcs.expectCall(), funcs.expectNoCall()); |
static_cast<payments::mojom::blink::PaymentRequestClient*>(request) |
@@ -96,16 +96,15 @@ TEST(CompleteTest, RejectCompletePromiseOnUpdateDetailsFailure) { |
PaymentRequestMockFunctionScope funcs(scope.getScriptState()); |
makePaymentRequestOriginSecure(scope.document()); |
PaymentRequest* request = PaymentRequest::create( |
- scope.document(), buildPaymentMethodDataForTest(), |
+ scope.getScriptState(), buildPaymentMethodDataForTest(), |
buildPaymentDetailsForTest(), scope.getExceptionState()); |
EXPECT_FALSE(scope.getExceptionState().hadException()); |
- request->show(scope.getScriptState()) |
- .then(funcs.expectCall(), funcs.expectNoCall()); |
+ request->show().then(funcs.expectCall(), funcs.expectNoCall()); |
static_cast<payments::mojom::blink::PaymentRequestClient*>(request) |
->OnPaymentResponse(buildPaymentResponseForTest()); |
String errorMessage; |
- request->complete(scope.getScriptState(), PaymentCompleter::Success) |
+ request->complete(PaymentCompleter::Success) |
.then(funcs.expectNoCall(), funcs.expectCall(&errorMessage)); |
request->onUpdatePaymentDetailsFailure("oops"); |
@@ -119,17 +118,16 @@ TEST(CompleteTest, RejectCompletePromiseAfterTimeout) { |
PaymentRequestMockFunctionScope funcs(scope.getScriptState()); |
makePaymentRequestOriginSecure(scope.document()); |
PaymentRequest* request = PaymentRequest::create( |
- scope.document(), buildPaymentMethodDataForTest(), |
+ scope.getScriptState(), buildPaymentMethodDataForTest(), |
buildPaymentDetailsForTest(), scope.getExceptionState()); |
EXPECT_FALSE(scope.getExceptionState().hadException()); |
- request->show(scope.getScriptState()) |
- .then(funcs.expectCall(), funcs.expectNoCall()); |
+ request->show().then(funcs.expectCall(), funcs.expectNoCall()); |
static_cast<payments::mojom::blink::PaymentRequestClient*>(request) |
->OnPaymentResponse(buildPaymentResponseForTest()); |
request->onCompleteTimeoutForTesting(); |
String errorMessage; |
- request->complete(scope.getScriptState(), PaymentCompleter::Success) |
+ request->complete(PaymentCompleter::Success) |
.then(funcs.expectNoCall(), funcs.expectCall(&errorMessage)); |
v8::MicrotasksScope::PerformCheckpoint(scope.getScriptState()->isolate()); |