Simplify Supplementables post Oilpan.

third_party/WebKit/Source/core/dom/ContextFeatures.h

Index: third_party/WebKit/Source/core/dom/ContextFeatures.h
diff --git a/third_party/WebKit/Source/core/dom/ContextFeatures.h b/third_party/WebKit/Source/core/dom/ContextFeatures.h
index fe53aa6186c2df6c5cda61f3c05fa69faf8fece5..796d763b5e7a5b0b416845a48a457c9e1718490f 100644
--- a/third_party/WebKit/Source/core/dom/ContextFeatures.h
+++ b/third_party/WebKit/Source/core/dom/ContextFeatures.h
@@ -29,7 +29,6 @@
 
 #include "core/CoreExport.h"
 #include "core/page/Page.h"
-#include "platform/RefCountedSupplement.h"
 
 namespace blink {
 
@@ -37,16 +36,9 @@ class ContextFeaturesClient;
 class Document;
 class Page;
 
-#if ENABLE(OILPAN)
-class ContextFeatures final : public GarbageCollectedFinalized<ContextFeatures>, public HeapSupplement<Page> {
+class ContextFeatures final : public GarbageCollectedFinalized<ContextFeatures>, public Supplement<Page> {
     USING_GARBAGE_COLLECTED_MIXIN(ContextFeatures);
 public:
-    typedef HeapSupplement<Page> SupplementType;
-#else
-class ContextFeatures : public RefCountedSupplement<Page, ContextFeatures> {
-public:
-    typedef RefCountedSupplement<Page, ContextFeatures> SupplementType;
-#endif
     enum FeatureType {
         PagePopup = 0,
         MutationEvents,
@@ -63,10 +55,6 @@ public:
     bool isEnabled(Document*, FeatureType, bool) const;
     void urlDidChange(Document*);
 
-#if ENABLE(OILPAN)
-    DEFINE_INLINE_VIRTUAL_TRACE() { HeapSupplement<Page>::trace(visitor); }
-#endif
-
 private:
     explicit ContextFeatures(PassOwnPtr<ContextFeaturesClient> client)
         : m_client(std::move(client))