Simplify Supplementables post Oilpan.

third_party/WebKit/Source/core/page/Page.cpp

Index: third_party/WebKit/Source/core/page/Page.cpp
diff --git a/third_party/WebKit/Source/core/page/Page.cpp b/third_party/WebKit/Source/core/page/Page.cpp
index d303c21ce78a3f7f4e8e21ffc17b5dcf8abc4f5d..7f785597925481a20e0ad5e9b20e8dd828d7a530 100644
--- a/third_party/WebKit/Source/core/page/Page.cpp
+++ b/third_party/WebKit/Source/core/page/Page.cpp
@@ -526,7 +526,6 @@ void Page::purgeMemory(DeviceKind deviceKind)
 
 DEFINE_TRACE(Page)
 {
-#if ENABLE(OILPAN)
     visitor->trace(m_animator);
     visitor->trace(m_autoscrollController);
     visitor->trace(m_chromeClient);
@@ -542,8 +541,7 @@ DEFINE_TRACE(Page)
     visitor->trace(m_multisamplingChangedObservers);
     visitor->trace(m_frameHost);
     visitor->trace(m_memoryPurgeController);
-    HeapSupplementable<Page>::trace(visitor);
-#endif
+    Supplementable<Page>::trace(visitor);
     PageLifecycleNotifier::trace(visitor);
     MemoryPurgeClient::trace(visitor);
 }
@@ -610,6 +608,6 @@ Page::PageClients::~PageClients()
 {
 }
 
-template class CORE_TEMPLATE_EXPORT HeapSupplement<Page>;
+template class CORE_TEMPLATE_EXPORT Supplement<Page>;
 
 } // namespace blink