| 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 23f2b2a624d08d873cf46a6bf509371a5811b36f..183f0fa6f3b2e1c7bbf49251841bacd0ad219fb2 100644
|
| --- a/third_party/WebKit/Source/bindings/core/v8/ScriptPromiseResolverTest.cpp
|
| +++ b/third_party/WebKit/Source/bindings/core/v8/ScriptPromiseResolverTest.cpp
|
| @@ -239,11 +239,11 @@ TEST_F(ScriptPromiseResolverTest, keepAliveUntilResolved)
|
| resolver = ScriptPromiseResolverKeepAlive::create(getScriptState());
|
| }
|
| resolver->keepAliveWhilePending();
|
| - Heap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
|
| + ThreadHeap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
|
| ASSERT_TRUE(ScriptPromiseResolverKeepAlive::isAlive());
|
|
|
| resolver->resolve("hello");
|
| - Heap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
|
| + ThreadHeap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
|
| EXPECT_FALSE(ScriptPromiseResolverKeepAlive::isAlive());
|
| }
|
|
|
| @@ -256,11 +256,11 @@ TEST_F(ScriptPromiseResolverTest, keepAliveUntilRejected)
|
| resolver = ScriptPromiseResolverKeepAlive::create(getScriptState());
|
| }
|
| resolver->keepAliveWhilePending();
|
| - Heap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
|
| + ThreadHeap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
|
| ASSERT_TRUE(ScriptPromiseResolverKeepAlive::isAlive());
|
|
|
| resolver->reject("hello");
|
| - Heap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
|
| + ThreadHeap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
|
| EXPECT_FALSE(ScriptPromiseResolverKeepAlive::isAlive());
|
| }
|
|
|
| @@ -273,11 +273,11 @@ TEST_F(ScriptPromiseResolverTest, keepAliveUntilStopped)
|
| resolver = ScriptPromiseResolverKeepAlive::create(getScriptState());
|
| }
|
| resolver->keepAliveWhilePending();
|
| - Heap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
|
| + ThreadHeap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
|
| EXPECT_TRUE(ScriptPromiseResolverKeepAlive::isAlive());
|
|
|
| getExecutionContext()->stopActiveDOMObjects();
|
| - Heap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
|
| + ThreadHeap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
|
| EXPECT_FALSE(ScriptPromiseResolverKeepAlive::isAlive());
|
| }
|
|
|
| @@ -290,16 +290,16 @@ TEST_F(ScriptPromiseResolverTest, suspend)
|
| resolver = ScriptPromiseResolverKeepAlive::create(getScriptState());
|
| }
|
| resolver->keepAliveWhilePending();
|
| - Heap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
|
| + ThreadHeap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
|
| ASSERT_TRUE(ScriptPromiseResolverKeepAlive::isAlive());
|
|
|
| getExecutionContext()->suspendActiveDOMObjects();
|
| resolver->resolve("hello");
|
| - Heap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
|
| + ThreadHeap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
|
| EXPECT_TRUE(ScriptPromiseResolverKeepAlive::isAlive());
|
|
|
| getExecutionContext()->stopActiveDOMObjects();
|
| - Heap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
|
| + ThreadHeap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
|
| EXPECT_FALSE(ScriptPromiseResolverKeepAlive::isAlive());
|
| }
|
|
|
|
|