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..3c85538b4553a608fc2b3dc743b5c4f9c2302aa2 100644
--- a/third_party/WebKit/Source/build/scripts/templates/ExperimentalFeatures.cpp.tmpl
+++ b/third_party/WebKit/Source/build/scripts/templates/ExperimentalFeatures.cpp.tmpl
@@ -12,9 +12,27 @@ 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);
+    if (errorMessage) {

[iclelland, 2015/12/23 03:56:12]

See the comment in Experiments.cpp -- it seems wrong to have to include logic
here for calling one of two methods, when they both just convert the reference
back into a pointer and call into Experiments::isApiEnabledImpl. Can we just
call it directly instead?

[chasej, 2015/12/23 15:58:24]

Yes, I agree it would be better to call directly into the impl.  Response to
your other comment has more detail.

+        return Experiments::isApiEnabled(executionContext, "{{feature.api_name}}", *errorMessage);
+    }
+    return Experiments::isApiEnabled(executionContext, "{{feature.api_name}}");
 }
 {% endif %}
 {% endfor %}