| Index: third_party/WebKit/Source/modules/payments/CanMakePaymentTest.cpp
|
| diff --git a/third_party/WebKit/Source/modules/payments/CanMakePaymentTest.cpp b/third_party/WebKit/Source/modules/payments/CanMakePaymentTest.cpp
|
| index 74362feac5d68e6ce3795a39cf26585c6da3d62f..58a7776504ca88699473bbc40b883d36f7eb5f96 100644
|
| --- a/third_party/WebKit/Source/modules/payments/CanMakePaymentTest.cpp
|
| +++ b/third_party/WebKit/Source/modules/payments/CanMakePaymentTest.cpp
|
| @@ -21,11 +21,10 @@ TEST(CanMakePaymentTest, RejectPromiseOnUserCancel) {
|
| PaymentRequestMockFunctionScope funcs(scope.getScriptState());
|
| makePaymentRequestOriginSecure(scope.document());
|
| PaymentRequest* request = PaymentRequest::create(
|
| - scope.document(), buildPaymentMethodDataForTest(),
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(),
|
| buildPaymentDetailsForTest(), scope.getExceptionState());
|
|
|
| - request->canMakePayment(scope.getScriptState())
|
| - .then(funcs.expectNoCall(), funcs.expectCall());
|
| + request->canMakePayment().then(funcs.expectNoCall(), funcs.expectCall());
|
|
|
| static_cast<PaymentRequestClient*>(request)->OnError(
|
| PaymentErrorReason::USER_CANCEL);
|
| @@ -36,11 +35,10 @@ TEST(CanMakePaymentTest, RejectPromiseOnUnknownError) {
|
| PaymentRequestMockFunctionScope funcs(scope.getScriptState());
|
| makePaymentRequestOriginSecure(scope.document());
|
| PaymentRequest* request = PaymentRequest::create(
|
| - scope.document(), buildPaymentMethodDataForTest(),
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(),
|
| buildPaymentDetailsForTest(), scope.getExceptionState());
|
|
|
| - request->canMakePayment(scope.getScriptState())
|
| - .then(funcs.expectNoCall(), funcs.expectCall());
|
| + request->canMakePayment().then(funcs.expectNoCall(), funcs.expectCall());
|
|
|
| static_cast<PaymentRequestClient*>(request)->OnError(
|
| PaymentErrorReason::UNKNOWN);
|
| @@ -51,12 +49,11 @@ TEST(CanMakePaymentTest, RejectDuplicateRequest) {
|
| PaymentRequestMockFunctionScope funcs(scope.getScriptState());
|
| makePaymentRequestOriginSecure(scope.document());
|
| PaymentRequest* request = PaymentRequest::create(
|
| - scope.document(), buildPaymentMethodDataForTest(),
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(),
|
| buildPaymentDetailsForTest(), scope.getExceptionState());
|
| - request->canMakePayment(scope.getScriptState());
|
| + request->canMakePayment();
|
|
|
| - request->canMakePayment(scope.getScriptState())
|
| - .then(funcs.expectNoCall(), funcs.expectCall());
|
| + request->canMakePayment().then(funcs.expectNoCall(), funcs.expectCall());
|
| }
|
|
|
| TEST(CanMakePaymentTest, RejectQueryQuotaExceeded) {
|
| @@ -64,11 +61,10 @@ TEST(CanMakePaymentTest, RejectQueryQuotaExceeded) {
|
| PaymentRequestMockFunctionScope funcs(scope.getScriptState());
|
| makePaymentRequestOriginSecure(scope.document());
|
| PaymentRequest* request = PaymentRequest::create(
|
| - scope.document(), buildPaymentMethodDataForTest(),
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(),
|
| buildPaymentDetailsForTest(), scope.getExceptionState());
|
|
|
| - request->canMakePayment(scope.getScriptState())
|
| - .then(funcs.expectNoCall(), funcs.expectCall());
|
| + request->canMakePayment().then(funcs.expectNoCall(), funcs.expectCall());
|
|
|
| static_cast<PaymentRequestClient*>(request)->OnCanMakePayment(
|
| CanMakePaymentQueryResult::QUERY_QUOTA_EXCEEDED);
|
| @@ -79,11 +75,11 @@ TEST(CanMakePaymentTest, ReturnCannotMakeCanMakePayment) {
|
| PaymentRequestMockFunctionScope funcs(scope.getScriptState());
|
| makePaymentRequestOriginSecure(scope.document());
|
| PaymentRequest* request = PaymentRequest::create(
|
| - scope.document(), buildPaymentMethodDataForTest(),
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(),
|
| buildPaymentDetailsForTest(), scope.getExceptionState());
|
| String captor;
|
| - request->canMakePayment(scope.getScriptState())
|
| - .then(funcs.expectCall(&captor), funcs.expectNoCall());
|
| + request->canMakePayment().then(funcs.expectCall(&captor),
|
| + funcs.expectNoCall());
|
|
|
| static_cast<PaymentRequestClient*>(request)->OnCanMakePayment(
|
| CanMakePaymentQueryResult::CANNOT_MAKE_PAYMENT);
|
| @@ -97,11 +93,11 @@ TEST(CanMakePaymentTest, ReturnCanMakePayment) {
|
| PaymentRequestMockFunctionScope funcs(scope.getScriptState());
|
| makePaymentRequestOriginSecure(scope.document());
|
| PaymentRequest* request = PaymentRequest::create(
|
| - scope.document(), buildPaymentMethodDataForTest(),
|
| + scope.getScriptState(), buildPaymentMethodDataForTest(),
|
| buildPaymentDetailsForTest(), scope.getExceptionState());
|
| String captor;
|
| - request->canMakePayment(scope.getScriptState())
|
| - .then(funcs.expectCall(&captor), funcs.expectNoCall());
|
| + request->canMakePayment().then(funcs.expectCall(&captor),
|
| + funcs.expectNoCall());
|
|
|
| static_cast<PaymentRequestClient*>(request)->OnCanMakePayment(
|
| CanMakePaymentQueryResult::CAN_MAKE_PAYMENT);
|
|
|