| Index: third_party/WebKit/Source/platform/testing/RunAllTests.cpp
|
| diff --git a/third_party/WebKit/Source/platform/testing/RunAllTests.cpp b/third_party/WebKit/Source/platform/testing/RunAllTests.cpp
|
| index 01aec52cfc6779372596622853c3bd0b6cb21113..ccb0d227b8e886dbc56ca8e4be14beeb7598fbcc 100644
|
| --- a/third_party/WebKit/Source/platform/testing/RunAllTests.cpp
|
| +++ b/third_party/WebKit/Source/platform/testing/RunAllTests.cpp
|
| @@ -61,7 +61,7 @@ double dummyCurrentTime()
|
| int runTestSuite(base::TestSuite* testSuite)
|
| {
|
| int result = testSuite->Run();
|
| - blink::Heap::collectAllGarbage();
|
| + blink::ThreadHeap::collectAllGarbage();
|
| return result;
|
| }
|
|
|
| @@ -95,7 +95,7 @@ int main(int argc, char** argv)
|
| platformConfig.compositorSupport = &compositorSupport;
|
| blink::TestingPlatformSupport platform(platformConfig);
|
|
|
| - blink::Heap::init();
|
| + blink::ThreadHeap::init();
|
| blink::ThreadState::attachMainThread();
|
| blink::ThreadState::current()->registerTraceDOMWrappers(nullptr, nullptr);
|
| blink::EventTracer::initialize();
|
| @@ -109,7 +109,7 @@ int main(int argc, char** argv)
|
| result = base::LaunchUnitTests(argc, argv, base::Bind(runTestSuite, base::Unretained(&testSuite)));
|
|
|
| blink::ThreadState::detachMainThread();
|
| - blink::Heap::shutdown();
|
| + blink::ThreadHeap::shutdown();
|
| }
|
| blink::CompositorFactory::shutdown();
|
| WTF::shutdown();
|
|
|