Store the list of trial tokens in OriginTrialContext

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

 {% from 'macros.tmpl' import license %}
 {{license()}}
 
 #include "core/origin_trials/OriginTrials.h"
 
 #include "core/dom/ExecutionContext.h"
-#include "core/origin_trials/OriginTrialContext.h"
 #include "platform/RuntimeEnabledFeatures.h"
 
 namespace blink {
 
-OriginTrials::OriginTrials(PassOwnPtrWillBeRawPtr<OriginTrialContext> originTrialContext)
-    : m_originTrialContext(originTrialContext) {}
-
 // static
 const char* OriginTrials::supplementName()
 {
    return "OriginTrials";
 }
 
 // static
 OriginTrials* OriginTrials::from(ExecutionContext* host)
 {
-    OriginTrials* originTrials = reinterpret_cast<OriginTrials*>(WillBeHeapSupplement<ExecutionContext>::from(host, supplementName()));
+    OriginTrials* originTrials = static_cast<OriginTrials*>(WillBeHeapSupplement<ExecutionContext>::from(host, supplementName()));
     if (!originTrials) {
-        originTrials = new OriginTrials(host->createOriginTrialContext());
+        originTrials = new OriginTrials(host);
         WillBeHeapSupplement<ExecutionContext>::provideTo(*host, supplementName(), adoptPtrWillBeNoop(originTrials));
     }
     return originTrials;
 }
 
+OriginTrials::OriginTrials(ExecutionContext* host)
+    : OriginTrialsBase(host) {}
+
 {% for feature in features %}
 {% if feature.origin_trial_feature_name %}
 
 // static
 bool OriginTrials::{{feature.first_lowered_name}}Enabled(ExecutionContext* executionContext, String& errorMessage) {
     return OriginTrials::from(executionContext)->{{feature.first_lowered_name}}EnabledImpl(&errorMessage);
 }
 
 // static
 bool OriginTrials::{{feature.first_lowered_name}}Enabled(ExecutionContext* executionContext) {
     return OriginTrials::from(executionContext)->{{feature.first_lowered_name}}EnabledImpl(nullptr);
 }
 
 {% endif %}
 {% endfor %}
 
 {% for feature in features %}
 {% if feature.origin_trial_feature_name %}
 
 bool OriginTrials::{{feature.first_lowered_name}}EnabledImpl(String* errorMessage) {
     if (RuntimeEnabledFeatures::{{feature.first_lowered_name}}Enabled())
         return true;
-    if (!m_originTrialContext) return false;
-    return m_originTrialContext->isFeatureEnabled("{{feature.origin_trial_feature_name}}", errorMessage);
+    return isFeatureEnabled("{{feature.origin_trial_feature_name}}", errorMessage);
 }
 {% endif %}
 {% endfor %}
 
 DEFINE_TRACE(OriginTrials)
 {
-    visitor->trace(m_originTrialContext);
-    WillBeHeapSupplement<ExecutionContext>::trace(visitor);
+    OriginTrialsBase::trace(visitor);
 }
+
 } // namespace blink