HeapSupplements are now just Supplements.

third_party/WebKit/Source/build/scripts/templates/OriginTrials.h.tmpl

 {% from 'macros.tmpl' import license %}
 {{license()}}
 
 #ifndef OriginTrials_h
 #define OriginTrials_h
 
 #include "core/CoreExport.h"
 #include "platform/Supplementable.h"
 #include "wtf/text/WTFString.h"
 
 namespace blink {
 
 class ExecutionContext;
 class OriginTrialContext;
 
 // A class that stores dynamic tests for experimental features which can be
 // enabled through the experimental framework via API keys.
 
-class CORE_EXPORT OriginTrials final : public GarbageCollected<OriginTrials>, public HeapSupplement<ExecutionContext> {
-USING_GARBAGE_COLLECTED_MIXIN(OriginTrials)
+class CORE_EXPORT OriginTrials final : public GarbageCollected<OriginTrials>, public Supplement<ExecutionContext> {
+    USING_GARBAGE_COLLECTED_MIXIN(OriginTrials);
 public:
     OriginTrials(RawPtr<OriginTrialContext>);
 
     static const char* supplementName();
     static OriginTrials* from(ExecutionContext*);
 
     {% for feature in features %}
     {% if feature.origin_trial_feature_name %}
 
     static bool {{feature.first_lowered_name}}Enabled(ExecutionContext* executionContext, String& errorMessage);
     static bool {{feature.first_lowered_name}}Enabled(ExecutionContext* executionContext);
     {% endif %}
     {% endfor %}
 
     DECLARE_TRACE();
 
 private:
     {% for feature in features %}
     {% if feature.origin_trial_feature_name %}
     bool {{feature.first_lowered_name}}EnabledImpl(String* errorMessage);
     {% endif %}
     {% endfor %}
 
     Member<OriginTrialContext> m_originTrialContext;
 };
 
 } // namespace blink
 
 #endif // OriginTrials_h