Index: third_party/WebKit/Source/core/streams/ReadableStreamReaderTest.cpp |
diff --git a/third_party/WebKit/Source/core/streams/ReadableStreamReaderTest.cpp b/third_party/WebKit/Source/core/streams/ReadableStreamReaderTest.cpp |
index b2c67b194b02171b287c5b4556d723e3484de88b..af7b78e45ba2217e897f33c84ba2a342667b1290 100644 |
--- a/third_party/WebKit/Source/core/streams/ReadableStreamReaderTest.cpp |
+++ b/third_party/WebKit/Source/core/streams/ReadableStreamReaderTest.cpp |
@@ -179,7 +179,7 @@ TEST_F(ReadableStreamReaderTest, Release) |
EXPECT_TRUE(onFulfilled.isNull()); |
EXPECT_TRUE(onRejected.isNull()); |
- isolate()->RunMicrotasks(); |
+ v8::MicrotasksScope::PerformCheckpoint(isolate()); |
EXPECT_TRUE(onFulfilled.isNull()); |
EXPECT_EQ("AbortError: the reader is already released", onRejected); |
@@ -208,7 +208,7 @@ TEST_F(ReadableStreamReaderTest, ReadAfterRelease) |
EXPECT_FALSE(result.isSet); |
EXPECT_TRUE(onRejected.isNull()); |
- isolate()->RunMicrotasks(); |
+ v8::MicrotasksScope::PerformCheckpoint(isolate()); |
EXPECT_FALSE(result.isSet); |
EXPECT_EQ("TypeError: the reader is already released", onRejected); |
@@ -250,7 +250,7 @@ TEST_F(ReadableStreamReaderTest, EnqueueThenRead) |
EXPECT_FALSE(result.isSet); |
EXPECT_TRUE(onRejected.isNull()); |
- isolate()->RunMicrotasks(); |
+ v8::MicrotasksScope::PerformCheckpoint(isolate()); |
EXPECT_TRUE(result.isSet); |
EXPECT_FALSE(result.isDone); |
@@ -264,7 +264,7 @@ TEST_F(ReadableStreamReaderTest, EnqueueThenRead) |
EXPECT_FALSE(result2.isSet); |
EXPECT_TRUE(onRejected2.isNull()); |
- isolate()->RunMicrotasks(); |
+ v8::MicrotasksScope::PerformCheckpoint(isolate()); |
EXPECT_TRUE(result2.isSet); |
EXPECT_FALSE(result2.isDone); |
@@ -290,7 +290,7 @@ TEST_F(ReadableStreamReaderTest, ReadThenEnqueue) |
EXPECT_FALSE(result2.isSet); |
EXPECT_TRUE(onRejected2.isNull()); |
- isolate()->RunMicrotasks(); |
+ v8::MicrotasksScope::PerformCheckpoint(isolate()); |
EXPECT_FALSE(result.isSet); |
EXPECT_TRUE(onRejected.isNull()); |
@@ -298,7 +298,7 @@ TEST_F(ReadableStreamReaderTest, ReadThenEnqueue) |
EXPECT_TRUE(onRejected2.isNull()); |
m_stream->enqueue("hello"); |
- isolate()->RunMicrotasks(); |
+ v8::MicrotasksScope::PerformCheckpoint(isolate()); |
EXPECT_TRUE(result.isSet); |
EXPECT_FALSE(result.isDone); |
@@ -308,7 +308,7 @@ TEST_F(ReadableStreamReaderTest, ReadThenEnqueue) |
EXPECT_TRUE(onRejected2.isNull()); |
m_stream->enqueue("world"); |
- isolate()->RunMicrotasks(); |
+ v8::MicrotasksScope::PerformCheckpoint(isolate()); |
EXPECT_TRUE(result2.isSet); |
EXPECT_FALSE(result2.isDone); |
@@ -330,7 +330,7 @@ TEST_F(ReadableStreamReaderTest, ClosedReader) |
String onClosedFulfilled, onClosedRejected; |
ReadResult result; |
String onReadRejected; |
- isolate()->RunMicrotasks(); |
+ v8::MicrotasksScope::PerformCheckpoint(isolate()); |
reader->closed(getScriptState()).then(createCaptor(&onClosedFulfilled), createCaptor(&onClosedRejected)); |
reader->read(getScriptState()).then(createResultCaptor(&result), createCaptor(&onReadRejected)); |
EXPECT_TRUE(onClosedFulfilled.isNull()); |
@@ -338,7 +338,7 @@ TEST_F(ReadableStreamReaderTest, ClosedReader) |
EXPECT_FALSE(result.isSet); |
EXPECT_TRUE(onReadRejected.isNull()); |
- isolate()->RunMicrotasks(); |
+ v8::MicrotasksScope::PerformCheckpoint(isolate()); |
EXPECT_EQ("undefined", onClosedFulfilled); |
EXPECT_TRUE(onClosedRejected.isNull()); |
EXPECT_TRUE(result.isSet); |
@@ -361,7 +361,7 @@ TEST_F(ReadableStreamReaderTest, ErroredReader) |
String onClosedFulfilled, onClosedRejected; |
String onReadFulfilled, onReadRejected; |
- isolate()->RunMicrotasks(); |
+ v8::MicrotasksScope::PerformCheckpoint(isolate()); |
reader->closed(getScriptState()).then(createCaptor(&onClosedFulfilled), createCaptor(&onClosedRejected)); |
reader->read(getScriptState()).then(createCaptor(&onReadFulfilled), createCaptor(&onReadRejected)); |
EXPECT_TRUE(onClosedFulfilled.isNull()); |
@@ -369,7 +369,7 @@ TEST_F(ReadableStreamReaderTest, ErroredReader) |
EXPECT_TRUE(onReadFulfilled.isNull()); |
EXPECT_TRUE(onReadRejected.isNull()); |
- isolate()->RunMicrotasks(); |
+ v8::MicrotasksScope::PerformCheckpoint(isolate()); |
EXPECT_TRUE(onClosedFulfilled.isNull()); |
EXPECT_EQ("SyntaxError: some error", onClosedRejected); |
EXPECT_TRUE(onReadFulfilled.isNull()); |
@@ -389,7 +389,7 @@ TEST_F(ReadableStreamReaderTest, PendingReadsShouldBeResolvedWhenClosed) |
reader->read(getScriptState()).then(createResultCaptor(&result), createCaptor(&onRejected)); |
reader->read(getScriptState()).then(createResultCaptor(&result2), createCaptor(&onRejected2)); |
- isolate()->RunMicrotasks(); |
+ v8::MicrotasksScope::PerformCheckpoint(isolate()); |
EXPECT_FALSE(result.isSet); |
EXPECT_TRUE(onRejected.isNull()); |
EXPECT_FALSE(result2.isSet); |
@@ -401,7 +401,7 @@ TEST_F(ReadableStreamReaderTest, PendingReadsShouldBeResolvedWhenClosed) |
EXPECT_FALSE(result2.isSet); |
EXPECT_TRUE(onRejected2.isNull()); |
- isolate()->RunMicrotasks(); |
+ v8::MicrotasksScope::PerformCheckpoint(isolate()); |
EXPECT_TRUE(result.isSet); |
EXPECT_TRUE(result.isDone); |
@@ -427,7 +427,7 @@ TEST_F(ReadableStreamReaderTest, PendingReadsShouldBeRejectedWhenErrored) |
reader->read(getScriptState()).then(createCaptor(&onFulfilled), createCaptor(&onRejected)); |
reader->read(getScriptState()).then(createCaptor(&onFulfilled2), createCaptor(&onRejected2)); |
- isolate()->RunMicrotasks(); |
+ v8::MicrotasksScope::PerformCheckpoint(isolate()); |
EXPECT_TRUE(onFulfilled.isNull()); |
EXPECT_TRUE(onRejected.isNull()); |
EXPECT_TRUE(onFulfilled2.isNull()); |
@@ -439,7 +439,7 @@ TEST_F(ReadableStreamReaderTest, PendingReadsShouldBeRejectedWhenErrored) |
EXPECT_TRUE(onFulfilled2.isNull()); |
EXPECT_TRUE(onRejected2.isNull()); |
- isolate()->RunMicrotasks(); |
+ v8::MicrotasksScope::PerformCheckpoint(isolate()); |
EXPECT_TRUE(onFulfilled.isNull()); |
EXPECT_EQ(onRejected, "SyntaxError: some error"); |
@@ -460,7 +460,7 @@ TEST_F(ReadableStreamReaderTest, PendingReadsShouldBeResolvedWhenCanceled) |
reader->read(getScriptState()).then(createResultCaptor(&result), createCaptor(&onRejected)); |
reader->read(getScriptState()).then(createResultCaptor(&result2), createCaptor(&onRejected2)); |
- isolate()->RunMicrotasks(); |
+ v8::MicrotasksScope::PerformCheckpoint(isolate()); |
EXPECT_FALSE(result.isSet); |
EXPECT_TRUE(onRejected.isNull()); |
EXPECT_FALSE(result2.isSet); |
@@ -473,7 +473,7 @@ TEST_F(ReadableStreamReaderTest, PendingReadsShouldBeResolvedWhenCanceled) |
EXPECT_FALSE(result2.isSet); |
EXPECT_TRUE(onRejected2.isNull()); |
- isolate()->RunMicrotasks(); |
+ v8::MicrotasksScope::PerformCheckpoint(isolate()); |
EXPECT_TRUE(result.isSet); |
EXPECT_TRUE(result.isDone); |
@@ -502,7 +502,7 @@ TEST_F(ReadableStreamReaderTest, CancelShouldNotWorkWhenNotActive) |
EXPECT_TRUE(onFulfilled.isNull()); |
EXPECT_TRUE(onRejected.isNull()); |
- isolate()->RunMicrotasks(); |
+ v8::MicrotasksScope::PerformCheckpoint(isolate()); |
EXPECT_TRUE(onFulfilled.isNull()); |
EXPECT_EQ("TypeError: the reader is already released", onRejected); |
@@ -528,7 +528,7 @@ TEST_F(ReadableStreamReaderTest, Cancel) |
EXPECT_TRUE(onCancelFulfilled.isNull()); |
EXPECT_TRUE(onCancelRejected.isNull()); |
- isolate()->RunMicrotasks(); |
+ v8::MicrotasksScope::PerformCheckpoint(isolate()); |
EXPECT_EQ("undefined", onClosedFulfilled); |
EXPECT_TRUE(onClosedRejected.isNull()); |
EXPECT_EQ("undefined", onCancelFulfilled); |
@@ -552,7 +552,7 @@ TEST_F(ReadableStreamReaderTest, Close) |
EXPECT_TRUE(onFulfilled.isNull()); |
EXPECT_TRUE(onRejected.isNull()); |
- isolate()->RunMicrotasks(); |
+ v8::MicrotasksScope::PerformCheckpoint(isolate()); |
EXPECT_EQ("undefined", onFulfilled); |
EXPECT_TRUE(onRejected.isNull()); |
EXPECT_FALSE(exceptionState.hadException()); |
@@ -574,7 +574,7 @@ TEST_F(ReadableStreamReaderTest, Error) |
EXPECT_TRUE(onFulfilled.isNull()); |
EXPECT_TRUE(onRejected.isNull()); |
- isolate()->RunMicrotasks(); |
+ v8::MicrotasksScope::PerformCheckpoint(isolate()); |
EXPECT_TRUE(onFulfilled.isNull()); |
EXPECT_EQ("SyntaxError: some error", onRejected); |
EXPECT_FALSE(exceptionState.hadException()); |