Force all experiment enabled checks to use ExperimentalFeatures

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

Index: third_party/WebKit/Source/build/scripts/templates/ExperimentalFeatures.cpp.tmpl
diff --git a/third_party/WebKit/Source/build/scripts/templates/ExperimentalFeatures.cpp.tmpl b/third_party/WebKit/Source/build/scripts/templates/ExperimentalFeatures.cpp.tmpl
index 95ff1ea3fec19aa60efae39ae96531a5d789ce75..cd5c417ffc93a430833863169bfc146da46d45de 100644
--- a/third_party/WebKit/Source/build/scripts/templates/ExperimentalFeatures.cpp.tmpl
+++ b/third_party/WebKit/Source/build/scripts/templates/ExperimentalFeatures.cpp.tmpl
@@ -12,6 +12,21 @@ namespace blink {
 
 // static
 bool ExperimentalFeatures::{{feature.first_lowered_name}}Enabled(ExecutionContext* executionContext, String& errorMessage) {
+    return {{feature.first_lowered_name}}EnabledImpl(executionContext, &errorMessage);
+}
+
+// static
+bool ExperimentalFeatures::{{feature.first_lowered_name}}Enabled(ExecutionContext* executionContext) {
+    return {{feature.first_lowered_name}}EnabledImpl(executionContext, nullptr);
+}
+{% endif %}
+{% endfor %}
+
+{% for feature in features %}
+{% if feature.api_name %}
+
+// static
+bool ExperimentalFeatures::{{feature.first_lowered_name}}EnabledImpl(ExecutionContext* executionContext, String* errorMessage) {
     if (RuntimeEnabledFeatures::{{feature.first_lowered_name}}Enabled())
         return true;
     return Experiments::isApiEnabled(executionContext, "{{feature.api_name}}", errorMessage);