Revert of Move collectGarbage* methods to ThreadState

third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DUsageTrackingTest.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/canvas2d/CanvasRenderingContext2D.h"
 
 #include "core/dom/Document.h"
 #include "core/fetch/MemoryCache.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/Settings.h"
@@ skipping 82 matching lines @@
     Persistent<MemoryCache> m_globalMemoryCache;
 };
 
 CanvasRenderingContextUsageTrackingTest::CanvasRenderingContextUsageTrackingTest()
     : m_opaqueBitmap(IntSize(10, 10), OpaqueBitmap)
     , m_alphaBitmap(IntSize(10, 10), TransparentBitmap)
 { }
 
 void CanvasRenderingContextUsageTrackingTest::TearDown()
 {
-    ThreadState::current()->collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
+    ThreadHeap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
     replaceMemoryCacheForTesting(m_globalMemoryCache.release());
 }
 
 CanvasRenderingContext2D* CanvasRenderingContextUsageTrackingTest::context2d() const
 {
     // If the following check fails, perhaps you forgot to call createContext
     // in your test?
     EXPECT_NE(nullptr, canvasElement().renderingContext());
     EXPECT_TRUE(canvasElement().renderingContext()->is2d());
     return static_cast<CanvasRenderingContext2D*>(canvasElement().renderingContext());
@@ skipping 379 matching lines @@
     EXPECT_EQ(0, context2d()->getUsage().numDrawCalls[BaseRenderingContext2D::FillRect]);
 
     for (int i = 0; i < numReps; i++) {
         context2d()->fillRect(10, 10, 100, 100);
     }
     EXPECT_EQ(numReps, context2d()->getUsage().numDrawCalls[BaseRenderingContext2D::FillRect]);
 }
 
 } // namespace UsageTrackingTests
 } // namespace blink