HeapSupplements are now just Supplements.

third_party/WebKit/Source/core/testing/InternalSettings.h

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013 Apple 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 29 matching lines @@
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 class Document;
 class ExceptionState;
 class LocalFrame;
 class Page;
 class Settings;
 
-#if ENABLE(OILPAN)
-class InternalSettings final : public InternalSettingsGenerated, public HeapSupplement<Page> {
+class InternalSettings final : public InternalSettingsGenerated, public Supplement<Page> {
     USING_GARBAGE_COLLECTED_MIXIN(InternalSettings);
-#else
-class InternalSettings final : public InternalSettingsGenerated {
-#endif
     DEFINE_WRAPPERTYPEINFO();
 public:
     class Backup {
         DISALLOW_NEW();
     public:
         explicit Backup(Settings*);
         void restoreTo(Settings*);
 
         bool m_originalCSP;
         bool m_originalCSSStickyPositionEnabled;
@@ skipping 15 matching lines @@
         bool m_originalScrollTopLeftInteropEnabled;
         bool m_originalCompositorWorkerEnabled;
     };
 
     static RawPtr<InternalSettings> create(Page& page)
     {
         return new InternalSettings(page);
     }
     static InternalSettings* from(Page&);
 
-#if !ENABLE(OILPAN)
-    void hostDestroyed() { m_page = nullptr; }
-#endif
-
     ~InternalSettings() override;
     void resetToConsistentState();
 
     void setStandardFontFamily(const AtomicString& family, const String& script, ExceptionState&);
     void setSerifFontFamily(const AtomicString& family, const String& script, ExceptionState&);
     void setSansSerifFontFamily(const AtomicString& family, const String& script, ExceptionState&);
     void setFixedFontFamily(const AtomicString& family, const String& script, ExceptionState&);
     void setCursiveFontFamily(const AtomicString& family, const String& script, ExceptionState&);
     void setFantasyFontFamily(const AtomicString& family, const String& script, ExceptionState&);
     void setPictographFontFamily(const AtomicString& family, const String& script, ExceptionState&);
@@ skipping 41 matching lines @@
     Page* page() const { return m_page; }
     static const char* supplementName();
 
     WeakMember<Page> m_page;
     Backup m_backup;
 };
 
 } // namespace blink
 
 #endif // InternalSettings_h