Store the list of trial tokens in OriginTrialContext

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

Index: third_party/WebKit/Source/build/scripts/templates/OriginTrials.h.tmpl
diff --git a/third_party/WebKit/Source/build/scripts/templates/OriginTrials.h.tmpl b/third_party/WebKit/Source/build/scripts/templates/OriginTrials.h.tmpl
index a5817b6137140be8ec33d0d9d38e897188f4032c..62f1733937fc31ed8ea089e74343381bb4b9680f 100644
--- a/third_party/WebKit/Source/build/scripts/templates/OriginTrials.h.tmpl
+++ b/third_party/WebKit/Source/build/scripts/templates/OriginTrials.h.tmpl
@@ -5,44 +5,22 @@
 #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 Supplement<ExecutionContext> {
-    USING_GARBAGE_COLLECTED_MIXIN(OriginTrials);
-public:
-    OriginTrials(RawPtr<OriginTrialContext>);
-
-    static const char* supplementName();
-    static OriginTrials* from(ExecutionContext*);
 
+// A namespace with dynamic tests for experimental features which can be enabled through the
+// experimental framework via origin trial tokens.
+namespace OriginTrials {
     {% 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);
+    CORE_EXPORT bool {{feature.first_lowered_name}}Enabled(ExecutionContext*, String& errorMessage);
+    CORE_EXPORT bool {{feature.first_lowered_name}}Enabled(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 OriginTrials
 
 } // namespace blink