Revert of Rename Heap to ThreadHeap

third_party/WebKit/Source/platform/heap/GarbageCollected.h

 // 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.
 
 #ifndef GarbageCollected_h
 #define GarbageCollected_h
 
 #include "platform/heap/ThreadState.h"
 #include "wtf/Allocator.h"
 #include "wtf/Assertions.h"
@@ skipping 186 matching lines @@
 // when the constructor of the recorded GarbageCollectedMixinConstructorMarker
 // runs.
 #define USING_GARBAGE_COLLECTED_MIXIN(TYPE)                             \
     IS_GARBAGE_COLLECTED_TYPE();                                        \
     DEFINE_GARBAGE_COLLECTED_MIXIN_METHODS(blink::Visitor*, TYPE)       \
     DEFINE_GARBAGE_COLLECTED_MIXIN_METHODS(blink::InlinedGlobalMarkingVisitor, TYPE) \
     DEFINE_GARBAGE_COLLECTED_MIXIN_CONSTRUCTOR_MARKER(TYPE)             \
 public:                                                                 \
     bool isHeapObjectAlive() const override                             \
     {                                                                   \
-        return ThreadHeap::isHeapObjectAlive(this);                           \
+        return Heap::isHeapObjectAlive(this);                           \
     }                                                                   \
 private:
 
 // An empty class with a constructor that's arranged invoked when all derived constructors
 // of a mixin instance have completed and it is safe to allow GCs again. See
 // AllocateObjectTrait<> comment for more.
 //
 // USING_GARBAGE_COLLECTED_MIXIN() declares a GarbageCollectedMixinConstructorMarker<> private
 // field. By following Blink convention of using the macro at the top of a class declaration,
 // its constructor will run first.
@@ skipping 172 matching lines @@
 
 namespace WTF {
 
 // Adoption is not needed nor wanted for RefCountedGarbageCollected<>-derived types.
 template<typename T>
 PassRefPtr<T> adoptRef(blink::RefCountedGarbageCollected<T>*) = delete;
 
 } // namespace WTF
 
 #endif