Oilpan: prefer ENABLE(OILPAN).

Source/platform/heap/HeapTest.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 1237 matching lines @@
 
     void setBackPointer(SuperClass* backPointer)
     {
         m_backPointer = backPointer;
     }
 
     SuperClass* backPointer() const { return m_backPointer; }
 
     DEFINE_INLINE_TRACE()
     {
-#if ENABLE_OILPAN
         visitor->trace(m_backPointer);
-#endif
     }
 
     static int s_aliveCount;
 private:
     PointsBack() : m_backPointer(nullptr)
     {
         ++s_aliveCount;
     }
 
     RawPtrWillBeWeakMember<SuperClass> m_backPointer;
 };
 
 int PointsBack::s_aliveCount = 0;
 
 class SuperClass : public RefCountedWillBeGarbageCollectedFinalized<SuperClass> {
 public:
     static PassRefPtrWillBeRawPtr<SuperClass> create(PassRefPtrWillBeRawPtr<PointsBack> pointsBack)
     {
         return adoptRefWillBeNoop(new SuperClass(pointsBack));
     }
 
     virtual ~SuperClass()
     {
-#if !ENABLE_OILPAN
+#if !ENABLE(OILPAN)
         m_pointsBack->setBackPointer(0);
 #endif
         --s_aliveCount;
     }
 
     void doStuff(PassRefPtrWillBeRawPtr<SuperClass> targetPass, PointsBack* pointsBack, int superClassCount)
     {
         RefPtrWillBeRawPtr<SuperClass> target = targetPass;
         Heap::collectGarbage(ThreadState::HeapPointersOnStack);
         EXPECT_EQ(pointsBack, target->pointsBack());
         EXPECT_EQ(superClassCount, SuperClass::s_aliveCount);
     }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
-#if ENABLE_OILPAN
         visitor->trace(m_pointsBack);
-#endif
     }
 
     PointsBack* pointsBack() const { return m_pointsBack.get(); }
 
     static int s_aliveCount;
 protected:
     explicit SuperClass(PassRefPtrWillBeRawPtr<PointsBack> pointsBack)
         : m_pointsBack(pointsBack)
     {
         m_pointsBack->setBackPointer(this);
@@ skipping 24 matching lines @@
         return adoptRefWillBeNoop(new SubClass(pointsBack));
     }
 
     virtual ~SubClass()
     {
         --s_aliveCount;
     }
 
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
-#if ENABLE_OILPAN
+        visitor->trace(m_data);
         SuperClass::trace(visitor);
-        visitor->trace(m_data);
-#endif
     }
 
     static int s_aliveCount;
 private:
     explicit SubClass(PassRefPtrWillBeRawPtr<PointsBack> pointsBack)
         : SuperClass(pointsBack)
         , m_data(adoptPtrWillBeNoop(new SubData()))
     {
         ++s_aliveCount;
     }
@@ skipping 4205 matching lines @@
 
 TEST(HeapTest, StackGrowthDirection)
 {
     // The implementation of marking probes stack usage as it runs,
     // and has a builtin assumption that the stack grows towards
     // lower addresses.
     EXPECT_EQ(GrowsTowardsLower, stackGrowthDirection());
 }
 
 } // namespace blink