Revert of Rename Heap to ThreadHeap

third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2DTest.cpp

 // Copyright 2014 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/fetch/MemoryCache.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/ImageBitmap.h"
 #include "core/html/HTMLCanvasElement.h"
@@ skipping 152 matching lines @@
     alphaGradient->addColorStop(1, String("rgba(0, 0, 255, 0.5)"), exceptionState);
     EXPECT_FALSE(exceptionState.hadException());
     StringOrCanvasGradientOrCanvasPattern wrappedAlphaGradient;
     this->alphaGradient().setCanvasGradient(alphaGradient);
 
     m_globalMemoryCache = replaceMemoryCacheForTesting(MemoryCache::create());
 }
 
 void CanvasRenderingContext2DTest::TearDown()
 {
-    ThreadHeap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
+    Heap::collectGarbage(BlinkGC::NoHeapPointersOnStack, BlinkGC::GCWithSweep, BlinkGC::ForcedGC);
     replaceMemoryCacheForTesting(m_globalMemoryCache.release());
 }
 
 //============================================================================
 
 class FakeAcceleratedImageBufferSurfaceForTesting : public UnacceleratedImageBufferSurface {
 public:
     FakeAcceleratedImageBufferSurfaceForTesting(const IntSize& size, OpacityMode mode)
         : UnacceleratedImageBufferSurface(size, mode)
         , m_isAccelerated(true) { }
@@ skipping 529 matching lines @@
     canvasElement().setSize(IntSize(20, 20));
     Mock::VerifyAndClearExpectations(fakeAccelerateSurfacePtr);
     EXPECT_EQ(400, getGlobalGPUMemoryUsage());
 
     // Tear down the second image buffer
     imageBuffer2.clear();
     EXPECT_EQ(0, getGlobalGPUMemoryUsage());
 }
 
 } // namespace blink