Revert of Move collectGarbage* methods to ThreadState

third_party/WebKit/Source/modules/csspaint/PaintWorkletTest.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/csspaint/PaintWorklet.h"
 
 #include "bindings/core/v8/ScriptSourceCode.h"
 #include "bindings/core/v8/V8GCController.h"
 #include "bindings/core/v8/WorkerOrWorkletScriptController.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 37 matching lines @@
     ScopedPersistent<v8::Function> handle;
     {
         v8::HandleScope handleScope(isolate);
         handle.set(isolate, definition->paintFunctionForTesting(isolate));
         handle.setPhantom();
     }
     ASSERT(!handle.isEmpty());
     ASSERT(handle.isWeak());
 
     // Run a GC, persistent shouldn't have been collected yet.
-    ThreadState::current()-> collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
     V8GCController::collectAllGarbageForTesting(isolate);
     ASSERT(!handle.isEmpty());
 
     // Delete the page & associated objects.
     m_page.reset();
 
     // Run a GC, the persistent should have been collected.
-    ThreadState::current()-> collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
     V8GCController::collectAllGarbageForTesting(isolate);
     ASSERT(handle.isEmpty());
 }
 
 } // naespace blink