Move collectGarbage* methods to ThreadState

third_party/WebKit/Source/platform/heap/RunAllTests.cpp

Index: third_party/WebKit/Source/platform/heap/RunAllTests.cpp
diff --git a/third_party/WebKit/Source/platform/heap/RunAllTests.cpp b/third_party/WebKit/Source/platform/heap/RunAllTests.cpp
index a20c0153963ce8e3a22e41c92804cf70cb58c7d5..ff5966f0370e0091b1a1e1fb183c29948d869161 100644
--- a/third_party/WebKit/Source/platform/heap/RunAllTests.cpp
+++ b/third_party/WebKit/Source/platform/heap/RunAllTests.cpp
@@ -52,9 +52,10 @@ public:
 int runHelper(base::TestSuite* testSuite)
 {
     BlinkTestEnvironmentScope blinkTestEnvironment;
-    blink::ThreadState::current()->registerTraceDOMWrappers(nullptr, nullptr, nullptr, nullptr);
+    blink::ThreadState* currentThreadState = blink::ThreadState::current();
+    currentThreadState->registerTraceDOMWrappers(nullptr, nullptr, nullptr, nullptr);
     int result = testSuite->Run();
-    blink::ThreadHeap::collectAllGarbage();
+    currentThreadState->collectAllGarbage();
     return result;
 }