Index: third_party/WebKit/Source/modules/payments/AbortTest.cpp |
diff --git a/third_party/WebKit/Source/modules/payments/AbortTest.cpp b/third_party/WebKit/Source/modules/payments/AbortTest.cpp |
index 44bd1b5c7e7875092c6eaa950f928f4702494b30..c57bc73b9febf9de9dddcdf7cf80014d197bf987 100644 |
--- a/third_party/WebKit/Source/modules/payments/AbortTest.cpp |
+++ b/third_party/WebKit/Source/modules/payments/AbortTest.cpp |
@@ -19,11 +19,10 @@ TEST(AbortTest, CannotAbortBeforeShow) { |
PaymentRequestMockFunctionScope funcs(scope.getScriptState()); |
makePaymentRequestOriginSecure(scope.document()); |
PaymentRequest* request = PaymentRequest::create( |
- scope.document(), buildPaymentMethodDataForTest(), |
+ scope.getScriptState(), buildPaymentMethodDataForTest(), |
buildPaymentDetailsForTest(), scope.getExceptionState()); |
- request->abort(scope.getScriptState()) |
- .then(funcs.expectNoCall(), funcs.expectCall()); |
+ request->abort().then(funcs.expectNoCall(), funcs.expectCall()); |
} |
// If request.abort() is called again before the previous abort() resolved, then |
@@ -33,13 +32,12 @@ TEST(AbortTest, CannotAbortTwiceConcurrently) { |
PaymentRequestMockFunctionScope funcs(scope.getScriptState()); |
makePaymentRequestOriginSecure(scope.document()); |
PaymentRequest* request = PaymentRequest::create( |
- scope.document(), buildPaymentMethodDataForTest(), |
+ scope.getScriptState(), buildPaymentMethodDataForTest(), |
buildPaymentDetailsForTest(), scope.getExceptionState()); |
- request->show(scope.getScriptState()); |
- request->abort(scope.getScriptState()); |
+ request->show(); |
+ request->abort(); |
- request->abort(scope.getScriptState()) |
- .then(funcs.expectNoCall(), funcs.expectCall()); |
+ request->abort().then(funcs.expectNoCall(), funcs.expectCall()); |
} |
// If request.abort() is called after calling request.show(), then abort() |
@@ -49,12 +47,11 @@ TEST(AbortTest, CanAbortAfterShow) { |
PaymentRequestMockFunctionScope funcs(scope.getScriptState()); |
makePaymentRequestOriginSecure(scope.document()); |
PaymentRequest* request = PaymentRequest::create( |
- scope.document(), buildPaymentMethodDataForTest(), |
+ scope.getScriptState(), buildPaymentMethodDataForTest(), |
buildPaymentDetailsForTest(), scope.getExceptionState()); |
- request->show(scope.getScriptState()); |
+ request->show(); |
- request->abort(scope.getScriptState()) |
- .then(funcs.expectNoCall(), funcs.expectNoCall()); |
+ request->abort().then(funcs.expectNoCall(), funcs.expectNoCall()); |
} |
// If the browser is unable to abort the payment, then the request.abort() |
@@ -64,12 +61,11 @@ TEST(AbortTest, FailedAbortShouldRejectAbortPromise) { |
PaymentRequestMockFunctionScope funcs(scope.getScriptState()); |
makePaymentRequestOriginSecure(scope.document()); |
PaymentRequest* request = PaymentRequest::create( |
- scope.document(), buildPaymentMethodDataForTest(), |
+ scope.getScriptState(), buildPaymentMethodDataForTest(), |
buildPaymentDetailsForTest(), scope.getExceptionState()); |
- request->show(scope.getScriptState()); |
+ request->show(); |
- request->abort(scope.getScriptState()) |
- .then(funcs.expectNoCall(), funcs.expectCall()); |
+ request->abort().then(funcs.expectNoCall(), funcs.expectCall()); |
static_cast<payments::mojom::blink::PaymentRequestClient*>(request)->OnAbort( |
false); |
@@ -82,15 +78,14 @@ TEST(AbortTest, CanAbortAgainAfterFirstAbortRejected) { |
PaymentRequestMockFunctionScope funcs(scope.getScriptState()); |
makePaymentRequestOriginSecure(scope.document()); |
PaymentRequest* request = PaymentRequest::create( |
- scope.document(), buildPaymentMethodDataForTest(), |
+ scope.getScriptState(), buildPaymentMethodDataForTest(), |
buildPaymentDetailsForTest(), scope.getExceptionState()); |
- request->show(scope.getScriptState()); |
- request->abort(scope.getScriptState()); |
+ request->show(); |
+ request->abort(); |
static_cast<payments::mojom::blink::PaymentRequestClient*>(request)->OnAbort( |
false); |
- request->abort(scope.getScriptState()) |
- .then(funcs.expectNoCall(), funcs.expectNoCall()); |
+ request->abort().then(funcs.expectNoCall(), funcs.expectNoCall()); |
} |
// If the browser successfully aborts the payment, then the request.show() |
@@ -100,13 +95,11 @@ TEST(AbortTest, SuccessfulAbortShouldRejectShowPromiseAndResolveAbortPromise) { |
PaymentRequestMockFunctionScope funcs(scope.getScriptState()); |
makePaymentRequestOriginSecure(scope.document()); |
PaymentRequest* request = PaymentRequest::create( |
- scope.document(), buildPaymentMethodDataForTest(), |
+ scope.getScriptState(), buildPaymentMethodDataForTest(), |
buildPaymentDetailsForTest(), scope.getExceptionState()); |
- request->show(scope.getScriptState()) |
- .then(funcs.expectNoCall(), funcs.expectCall()); |
- request->abort(scope.getScriptState()) |
- .then(funcs.expectCall(), funcs.expectNoCall()); |
+ request->show().then(funcs.expectNoCall(), funcs.expectCall()); |
+ request->abort().then(funcs.expectCall(), funcs.expectNoCall()); |
static_cast<payments::mojom::blink::PaymentRequestClient*>(request)->OnAbort( |
true); |