| 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 2e95f336818a449bf4b4992c58ebeea61951d0d7..19b33aee4750b28b698ceb0105f4d27a2d960430 100644
|
| --- a/third_party/WebKit/Source/modules/payments/CompleteTest.cpp
|
| +++ b/third_party/WebKit/Source/modules/payments/CompleteTest.cpp
|
| @@ -21,8 +21,8 @@
|
| buildPaymentDetailsForTest(), scope.getExceptionState());
|
| EXPECT_FALSE(scope.getExceptionState().hadException());
|
| request->show(scope.getScriptState());
|
| - static_cast<payments::mojom::blink::PaymentRequestClient*>(request)
|
| - ->OnPaymentResponse(buildPaymentResponseForTest());
|
| + static_cast<mojom::blink::PaymentRequestClient*>(request)->OnPaymentResponse(
|
| + buildPaymentResponseForTest());
|
| request->complete(scope.getScriptState(), PaymentCompleter::Fail);
|
|
|
| request->complete(scope.getScriptState(), PaymentCompleter::Success)
|
| @@ -38,15 +38,15 @@
|
| buildPaymentDetailsForTest(), scope.getExceptionState());
|
| EXPECT_FALSE(scope.getExceptionState().hadException());
|
| request->show(scope.getScriptState());
|
| - static_cast<payments::mojom::blink::PaymentRequestClient*>(request)
|
| - ->OnPaymentResponse(buildPaymentResponseForTest());
|
| + static_cast<mojom::blink::PaymentRequestClient*>(request)->OnPaymentResponse(
|
| + buildPaymentResponseForTest());
|
|
|
| String errorMessage;
|
| request->complete(scope.getScriptState(), PaymentCompleter::Success)
|
| .then(funcs.expectNoCall(), funcs.expectCall(&errorMessage));
|
|
|
| - static_cast<payments::mojom::blink::PaymentRequestClient*>(request)->OnError(
|
| - payments::mojom::blink::PaymentErrorReason::UNKNOWN);
|
| + static_cast<mojom::blink::PaymentRequestClient*>(request)->OnError(
|
| + mojom::blink::PaymentErrorReason::UNKNOWN);
|
|
|
| v8::MicrotasksScope::PerformCheckpoint(scope.getScriptState()->isolate());
|
| EXPECT_EQ("UnknownError: Request failed", errorMessage);
|
| @@ -63,10 +63,10 @@
|
| buildPaymentDetailsForTest(), scope.getExceptionState());
|
| EXPECT_FALSE(scope.getExceptionState().hadException());
|
| request->show(scope.getScriptState());
|
| - static_cast<payments::mojom::blink::PaymentRequestClient*>(request)
|
| - ->OnPaymentResponse(buildPaymentResponseForTest());
|
| - static_cast<payments::mojom::blink::PaymentRequestClient*>(request)->OnError(
|
| - payments::mojom::blink::PaymentErrorReason::USER_CANCEL);
|
| + static_cast<mojom::blink::PaymentRequestClient*>(request)->OnPaymentResponse(
|
| + buildPaymentResponseForTest());
|
| + static_cast<mojom::blink::PaymentRequestClient*>(request)->OnError(
|
| + mojom::blink::PaymentErrorReason::USER_CANCEL);
|
|
|
| request->complete(scope.getScriptState(), PaymentCompleter::Success)
|
| .then(funcs.expectNoCall(), funcs.expectCall());
|
| @@ -81,14 +81,13 @@
|
| buildPaymentDetailsForTest(), scope.getExceptionState());
|
| EXPECT_FALSE(scope.getExceptionState().hadException());
|
| request->show(scope.getScriptState());
|
| - static_cast<payments::mojom::blink::PaymentRequestClient*>(request)
|
| - ->OnPaymentResponse(buildPaymentResponseForTest());
|
| + static_cast<mojom::blink::PaymentRequestClient*>(request)->OnPaymentResponse(
|
| + buildPaymentResponseForTest());
|
|
|
| request->complete(scope.getScriptState(), PaymentCompleter::Success)
|
| .then(funcs.expectCall(), funcs.expectNoCall());
|
|
|
| - static_cast<payments::mojom::blink::PaymentRequestClient*>(request)
|
| - ->OnComplete();
|
| + static_cast<mojom::blink::PaymentRequestClient*>(request)->OnComplete();
|
| }
|
|
|
| TEST(CompleteTest, RejectCompletePromiseOnUpdateDetailsFailure) {
|
| @@ -101,8 +100,8 @@
|
| EXPECT_FALSE(scope.getExceptionState().hadException());
|
| request->show(scope.getScriptState())
|
| .then(funcs.expectCall(), funcs.expectNoCall());
|
| - static_cast<payments::mojom::blink::PaymentRequestClient*>(request)
|
| - ->OnPaymentResponse(buildPaymentResponseForTest());
|
| + static_cast<mojom::blink::PaymentRequestClient*>(request)->OnPaymentResponse(
|
| + buildPaymentResponseForTest());
|
|
|
| String errorMessage;
|
| request->complete(scope.getScriptState(), PaymentCompleter::Success)
|
| @@ -124,8 +123,8 @@
|
| EXPECT_FALSE(scope.getExceptionState().hadException());
|
| request->show(scope.getScriptState())
|
| .then(funcs.expectCall(), funcs.expectNoCall());
|
| - static_cast<payments::mojom::blink::PaymentRequestClient*>(request)
|
| - ->OnPaymentResponse(buildPaymentResponseForTest());
|
| + static_cast<mojom::blink::PaymentRequestClient*>(request)->OnPaymentResponse(
|
| + buildPaymentResponseForTest());
|
| request->onCompleteTimeoutForTesting();
|
|
|
| String errorMessage;
|
|
|