PaymentRequest: Move m_abortTimer to frame-specific TaskRunnerTimer.

third_party/WebKit/Source/modules/payments/PaymentRequestUpdateEventTest.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/payments/PaymentRequestUpdateEvent.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8BindingForTesting.h"
@@ skipping 19 matching lines @@
 
   MOCK_METHOD1(onUpdatePaymentDetails,
                void(const ScriptValue& detailsScriptValue));
   MOCK_METHOD1(onUpdatePaymentDetailsFailure, void(const String& error));
 
   DEFINE_INLINE_TRACE() {}
 };
 
 TEST(PaymentRequestUpdateEventTest, OnUpdatePaymentDetailsCalled) {
   V8TestingScope scope;
-  PaymentRequestUpdateEvent* event =
-      PaymentRequestUpdateEvent::create(EventTypeNames::shippingaddresschange);
+  PaymentRequestUpdateEvent* event = PaymentRequestUpdateEvent::create(
+      scope.getExecutionContext(), EventTypeNames::shippingaddresschange);
   MockPaymentUpdater* updater = new MockPaymentUpdater;
   event->setPaymentDetailsUpdater(updater);
   event->setEventPhase(Event::kCapturingPhase);
   ScriptPromiseResolver* paymentDetails =
       ScriptPromiseResolver::create(scope.getScriptState());
   event->updateWith(scope.getScriptState(), paymentDetails->promise(),
                     scope.getExceptionState());
   EXPECT_FALSE(scope.getExceptionState().hadException());
 
   EXPECT_CALL(*updater, onUpdatePaymentDetails(testing::_));
   EXPECT_CALL(*updater, onUpdatePaymentDetailsFailure(testing::_)).Times(0);
 
   paymentDetails->resolve("foo");
 }
 
 TEST(PaymentRequestUpdateEventTest, OnUpdatePaymentDetailsFailureCalled) {
   V8TestingScope scope;
-  PaymentRequestUpdateEvent* event =
-      PaymentRequestUpdateEvent::create(EventTypeNames::shippingaddresschange);
+  PaymentRequestUpdateEvent* event = PaymentRequestUpdateEvent::create(
+      scope.getExecutionContext(), EventTypeNames::shippingaddresschange);
   MockPaymentUpdater* updater = new MockPaymentUpdater;
   event->setPaymentDetailsUpdater(updater);
   event->setEventPhase(Event::kCapturingPhase);
   ScriptPromiseResolver* paymentDetails =
       ScriptPromiseResolver::create(scope.getScriptState());
   event->updateWith(scope.getScriptState(), paymentDetails->promise(),
                     scope.getExceptionState());
   EXPECT_FALSE(scope.getExceptionState().hadException());
 
   EXPECT_CALL(*updater, onUpdatePaymentDetails(testing::_)).Times(0);
   EXPECT_CALL(*updater, onUpdatePaymentDetailsFailure(testing::_));
 
   paymentDetails->reject("oops");
 }
 
 TEST(PaymentRequestUpdateEventTest, CannotUpdateWithoutDispatching) {
   V8TestingScope scope;
-  PaymentRequestUpdateEvent* event =
-      PaymentRequestUpdateEvent::create(EventTypeNames::shippingaddresschange);
+  PaymentRequestUpdateEvent* event = PaymentRequestUpdateEvent::create(
+      scope.getExecutionContext(), EventTypeNames::shippingaddresschange);
   event->setPaymentDetailsUpdater(new MockPaymentUpdater);
 
   event->updateWith(
       scope.getScriptState(),
       ScriptPromiseResolver::create(scope.getScriptState())->promise(),
       scope.getExceptionState());
 
   EXPECT_TRUE(scope.getExceptionState().hadException());
 }
 
 TEST(PaymentRequestUpdateEventTest, CannotUpdateTwice) {
   V8TestingScope scope;
-  PaymentRequestUpdateEvent* event =
-      PaymentRequestUpdateEvent::create(EventTypeNames::shippingaddresschange);
+  PaymentRequestUpdateEvent* event = PaymentRequestUpdateEvent::create(
+      scope.getExecutionContext(), EventTypeNames::shippingaddresschange);
   MockPaymentUpdater* updater = new MockPaymentUpdater;
   event->setPaymentDetailsUpdater(updater);
   event->setEventPhase(Event::kCapturingPhase);
   event->updateWith(
       scope.getScriptState(),
       ScriptPromiseResolver::create(scope.getScriptState())->promise(),
       scope.getExceptionState());
   EXPECT_FALSE(scope.getExceptionState().hadException());
 
   event->updateWith(
       scope.getScriptState(),
       ScriptPromiseResolver::create(scope.getScriptState())->promise(),
       scope.getExceptionState());
 
   EXPECT_TRUE(scope.getExceptionState().hadException());
 }
 
 TEST(PaymentRequestUpdateEventTest, UpdaterNotRequired) {
   V8TestingScope scope;
-  PaymentRequestUpdateEvent* event =
-      PaymentRequestUpdateEvent::create(EventTypeNames::shippingaddresschange);
+  PaymentRequestUpdateEvent* event = PaymentRequestUpdateEvent::create(
+      scope.getExecutionContext(), EventTypeNames::shippingaddresschange);
 
   event->updateWith(
       scope.getScriptState(),
       ScriptPromiseResolver::create(scope.getScriptState())->promise(),
       scope.getExceptionState());
 
   EXPECT_FALSE(scope.getExceptionState().hadException());
 }
 
 TEST(PaymentRequestUpdateEventTest, OnUpdatePaymentDetailsTimeout) {
   V8TestingScope scope;
   PaymentRequestMockFunctionScope funcs(scope.getScriptState());
   makePaymentRequestOriginSecure(scope.document());
   PaymentRequest* request = PaymentRequest::create(
       scope.document(), buildPaymentMethodDataForTest(),
       buildPaymentDetailsForTest(), scope.getExceptionState());
-  PaymentRequestUpdateEvent* event =
-      PaymentRequestUpdateEvent::create(EventTypeNames::shippingaddresschange);
+  PaymentRequestUpdateEvent* event = PaymentRequestUpdateEvent::create(
+      scope.getExecutionContext(), EventTypeNames::shippingaddresschange);
   event->setPaymentDetailsUpdater(request);
   EXPECT_FALSE(scope.getExceptionState().hadException());
 
   String errorMessage;
   request->show(scope.getScriptState())
       .then(funcs.expectNoCall(), funcs.expectCall(&errorMessage));
 
   event->onUpdateEventTimeoutForTesting();
 
   v8::MicrotasksScope::PerformCheckpoint(scope.getScriptState()->isolate());
   EXPECT_EQ(
       "AbortError: Timed out as the page didn't resolve the promise from "
       "change event",
       errorMessage);
 }
 
 }  // namespace
 }  // namespace blink