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 ab3b5308d9c3789cec08887e8379643f3a869c8a..a30dca33fc2a6ef94f43b52056e4fab475b70e77 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);
+    blink::ThreadState* currentThreadState = blink::ThreadState::current();
+    currentThreadState->registerTraceDOMWrappers(nullptr, nullptr, nullptr);
     int result = testSuite->Run();
-    blink::ThreadHeap::collectAllGarbage();
+    currentThreadState->collectAllGarbage();
     return result;
 }