Store the list of trial tokens in OriginTrialContext

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

Index: third_party/WebKit/Source/build/scripts/templates/OriginTrials.cpp.tmpl
diff --git a/third_party/WebKit/Source/build/scripts/templates/OriginTrials.cpp.tmpl b/third_party/WebKit/Source/build/scripts/templates/OriginTrials.cpp.tmpl
index c95d7fbad9c5a1795703f366aa3913056988a916..5cad45d87a96ae41766e9728fc710756e5818cd5 100644
--- a/third_party/WebKit/Source/build/scripts/templates/OriginTrials.cpp.tmpl
+++ b/third_party/WebKit/Source/build/scripts/templates/OriginTrials.cpp.tmpl
@@ -4,14 +4,10 @@
 #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()
 {
@@ -21,14 +17,17 @@ const char* OriginTrials::supplementName()
 // 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 %}
 
@@ -51,15 +50,14 @@ bool OriginTrials::{{feature.first_lowered_name}}Enabled(ExecutionContext* execu
 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