| Index: third_party/WebKit/Source/bindings/core/v8/ScriptPromiseResolverTest.cpp
|
| diff --git a/third_party/WebKit/Source/bindings/core/v8/ScriptPromiseResolverTest.cpp b/third_party/WebKit/Source/bindings/core/v8/ScriptPromiseResolverTest.cpp
|
| index 44cbc1563d31c40d64f101eacbca7f249634aa9e..c49e1a39167fe9275c1fce620d132c683e50698a 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/ScriptPromiseResolverTest.cpp
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/ScriptPromiseResolverTest.cpp
|
| @@ -241,11 +241,11 @@ TEST_F(ScriptPromiseResolverTest, keepAliveUntilResolved)
|
| resolver = ScriptPromiseResolverKeepAlive::create(scriptState());
|
| }
|
| resolver->keepAliveWhilePending();
|
| - Heap::collectGarbage(ThreadState::NoHeapPointersOnStack, ThreadState::GCWithSweep, Heap::ForcedGC);
|
| + Heap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, Heap::ForcedGC);
|
| ASSERT_TRUE(ScriptPromiseResolverKeepAlive::isAlive());
|
|
|
| resolver->resolve("hello");
|
| - Heap::collectGarbage(ThreadState::NoHeapPointersOnStack, ThreadState::GCWithSweep, Heap::ForcedGC);
|
| + Heap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, Heap::ForcedGC);
|
| EXPECT_FALSE(ScriptPromiseResolverKeepAlive::isAlive());
|
| }
|
|
|
| @@ -258,11 +258,11 @@ TEST_F(ScriptPromiseResolverTest, keepAliveUntilRejected)
|
| resolver = ScriptPromiseResolverKeepAlive::create(scriptState());
|
| }
|
| resolver->keepAliveWhilePending();
|
| - Heap::collectGarbage(ThreadState::NoHeapPointersOnStack, ThreadState::GCWithSweep, Heap::ForcedGC);
|
| + Heap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, Heap::ForcedGC);
|
| ASSERT_TRUE(ScriptPromiseResolverKeepAlive::isAlive());
|
|
|
| resolver->reject("hello");
|
| - Heap::collectGarbage(ThreadState::NoHeapPointersOnStack, ThreadState::GCWithSweep, Heap::ForcedGC);
|
| + Heap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, Heap::ForcedGC);
|
| EXPECT_FALSE(ScriptPromiseResolverKeepAlive::isAlive());
|
| }
|
|
|
| @@ -275,11 +275,11 @@ TEST_F(ScriptPromiseResolverTest, keepAliveUntilStopped)
|
| resolver = ScriptPromiseResolverKeepAlive::create(scriptState());
|
| }
|
| resolver->keepAliveWhilePending();
|
| - Heap::collectGarbage(ThreadState::NoHeapPointersOnStack, ThreadState::GCWithSweep, Heap::ForcedGC);
|
| + Heap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, Heap::ForcedGC);
|
| EXPECT_TRUE(ScriptPromiseResolverKeepAlive::isAlive());
|
|
|
| executionContext()->stopActiveDOMObjects();
|
| - Heap::collectGarbage(ThreadState::NoHeapPointersOnStack, ThreadState::GCWithSweep, Heap::ForcedGC);
|
| + Heap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, Heap::ForcedGC);
|
| EXPECT_FALSE(ScriptPromiseResolverKeepAlive::isAlive());
|
| }
|
|
|
| @@ -292,16 +292,16 @@ TEST_F(ScriptPromiseResolverTest, suspend)
|
| resolver = ScriptPromiseResolverKeepAlive::create(scriptState());
|
| }
|
| resolver->keepAliveWhilePending();
|
| - Heap::collectGarbage(ThreadState::NoHeapPointersOnStack, ThreadState::GCWithSweep, Heap::ForcedGC);
|
| + Heap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, Heap::ForcedGC);
|
| ASSERT_TRUE(ScriptPromiseResolverKeepAlive::isAlive());
|
|
|
| executionContext()->suspendActiveDOMObjects();
|
| resolver->resolve("hello");
|
| - Heap::collectGarbage(ThreadState::NoHeapPointersOnStack, ThreadState::GCWithSweep, Heap::ForcedGC);
|
| + Heap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, Heap::ForcedGC);
|
| EXPECT_TRUE(ScriptPromiseResolverKeepAlive::isAlive());
|
|
|
| executionContext()->stopActiveDOMObjects();
|
| - Heap::collectGarbage(ThreadState::NoHeapPointersOnStack, ThreadState::GCWithSweep, Heap::ForcedGC);
|
| + Heap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, Heap::ForcedGC);
|
| EXPECT_FALSE(ScriptPromiseResolverKeepAlive::isAlive());
|
| }
|
|
|
|
|