[Experimental Framework] Make the OriginTrialContext a member of ExecutionContext

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 f49790ed580e176c09d93000e3e703397add34a9..94e57d7420c59e6b32cb044dc0440dc8418be79e 100644
--- a/third_party/WebKit/Source/build/scripts/templates/OriginTrials.h.tmpl
+++ b/third_party/WebKit/Source/build/scripts/templates/OriginTrials.h.tmpl
@@ -10,27 +10,34 @@
 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 {
 public:
+    OriginTrials(OriginTrialContext*);
     {% for feature in features %}
     {% if feature.origin_trial_feature_name %}
+
+    // TODO(iclelland): Remove this static method in favour of calling the
+    // instance on the ExecutionContext directly, once the bindings generation
+    // code is updated to match.
     static bool {{feature.first_lowered_name}}Enabled(ExecutionContext* executionContext, String& errorMessage);
-    static bool {{feature.first_lowered_name}}Enabled(ExecutionContext* executionContext);
+    bool {{feature.first_lowered_name}}Enabled(String& errorMessage);
+    bool {{feature.first_lowered_name}}Enabled();
     {% endif %}
     {% endfor %}
 
 private:
-    OriginTrials() { }
-
     {% for feature in features %}
     {% if feature.origin_trial_feature_name %}
-    static bool {{feature.first_lowered_name}}EnabledImpl(ExecutionContext* executionContext, String* errorMessage);
+    bool {{feature.first_lowered_name}}EnabledImpl(String* errorMessage);
     {% endif %}
     {% endfor %}
+
+    OriginTrialContext* m_originTrialContext;
 };
 
 } // namespace blink