Revert of Move collectGarbage* methods to ThreadState

third_party/WebKit/Source/platform/scheduler/CancellableTaskFactoryTest.cpp

 // Copyright 2015 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 "platform/scheduler/CancellableTaskFactory.h"
 
 #include "platform/heap/Handle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
@@ skipping 198 matching lines @@
 int GCObject::s_destructed = 0;
 int GCObject::s_invoked = 0;
 
 } // namespace
 
 TEST(CancellableTaskFactoryTest, GarbageCollectedWeak)
 {
     GCObject* object = new GCObject();
     std::unique_ptr<WebTaskRunner::Task> task = wrapUnique(object->m_factory->cancelAndCreate());
     object = nullptr;
-    ThreadState::current()-> collectAllGarbage();
+    ThreadHeap::collectAllGarbage();
     task->run();
     // The owning object will have been GCed and the task will have
     // lost its weak reference. Verify that it wasn't invoked.
     EXPECT_EQ(0, GCObject::s_invoked);
 
     // ..and just to make sure |object| was indeed destructed.
     EXPECT_EQ(1, GCObject::s_destructed);
 }
 
 } // namespace blink