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 d7f4d54b0c2f3b339e70f8d36cc54ee3beaf7f08..6c090aa59032a4d3472214265bb8f23395ccd458 100644
--- a/third_party/WebKit/Source/build/scripts/templates/OriginTrials.h.tmpl
+++ b/third_party/WebKit/Source/build/scripts/templates/OriginTrials.h.tmpl
@@ -5,6 +5,7 @@
 #define OriginTrials_h
 
 #include "core/CoreExport.h"
+#include "core/origin_trials/OriginTrialsBase.h"
 #include "platform/Supplementable.h"
 #include "wtf/text/WTFString.h"
 
@@ -16,32 +17,30 @@ 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 NoBaseWillBeGarbageCollected<OriginTrials>, public WillBeHeapSupplement<ExecutionContext> {
+class CORE_EXPORT OriginTrials final : public OriginTrialsBase, public WillBeHeapSupplement<ExecutionContext> {
 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(OriginTrials)
 public:
-    OriginTrials(PassOwnPtrWillBeRawPtr<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);
+    static bool {{feature.first_lowered_name}}Enabled(ExecutionContext*, String& errorMessage);
+    static bool {{feature.first_lowered_name}}Enabled(ExecutionContext*);
     {% endif %}
     {% endfor %}
 
-    DECLARE_TRACE();
+    DECLARE_VIRTUAL_TRACE();
 
 private:
+    explicit OriginTrials(ExecutionContext*);
+
     {% for feature in features %}
     {% if feature.origin_trial_feature_name %}
     bool {{feature.first_lowered_name}}EnabledImpl(String* errorMessage);
     {% endif %}
     {% endfor %}
-
-    OwnPtrWillBeMember<OriginTrialContext> m_originTrialContext;
 };
 
 } // namespace blink