Eagerly install Origin Trial features on window

third_party/WebKit/Source/bindings/templates/interface_base.cpp.tmpl

Index: third_party/WebKit/Source/bindings/templates/interface_base.cpp.tmpl
diff --git a/third_party/WebKit/Source/bindings/templates/interface_base.cpp.tmpl b/third_party/WebKit/Source/bindings/templates/interface_base.cpp.tmpl
index 0f9744bdcef8aea0ab3eb9ab6bc50b8f58166fa8..b08905e539d157bf0da7f2b4c11d1d3891925a7a 100644
--- a/third_party/WebKit/Source/bindings/templates/interface_base.cpp.tmpl
+++ b/third_party/WebKit/Source/bindings/templates/interface_base.cpp.tmpl
@@ -390,7 +390,9 @@ static void install{{v8_class}}Template(v8::Isolate* isolate, const DOMWrapperWo
 {% from 'constants.cpp.tmpl' import constant_configuration with context %}
 {% from 'methods.cpp.tmpl' import method_configuration with context %}
 {% for origin_trial_feature in origin_trial_features %}{{newline}}
-void {{v8_class_or_partial}}::install{{origin_trial_feature.name}}(v8::Isolate* isolate, const DOMWrapperWorld& world, v8::Local<v8::Object> instance, v8::Local<v8::Object> prototype, v8::Local<v8::Function> interface) {
+void {{v8_class_or_partial}}::install{{origin_trial_feature.name}}(const ScriptState* scriptState, v8::Local<v8::Object> instance, v8::Local<v8::Object> prototype, v8::Local<v8::Function> interface) {
+  v8::Isolate* isolate = scriptState->isolate();
+  const DOMWrapperWorld& world = scriptState->world();
   {% if attributes | for_origin_trial_feature(origin_trial_feature.name) or
         methods | method_for_origin_trial_feature(origin_trial_feature.name, is_partial) %}
   v8::Local<v8::FunctionTemplate> interfaceTemplate = {{v8_class}}::wrapperTypeInfo.domTemplate(isolate, world);
@@ -401,7 +403,7 @@ void {{v8_class_or_partial}}::install{{origin_trial_feature.name}}(v8::Isolate*
   {% for attribute in attributes | for_origin_trial_feature(origin_trial_feature.name) | unique_by('name') | sort %}
   {% if attribute.is_data_type_property %}
   const V8DOMConfiguration::AttributeConfiguration attribute{{attribute.name}}Configuration = {{attribute_configuration(attribute)}};
-  V8DOMConfiguration::installAttribute(isolate, world, instance, prototype, attribute{{attribute.name}}Configuration);
+  V8DOMConfiguration::installAttribute(scriptState, instance, prototype, attribute{{attribute.name}}Configuration);
   {% else %}
   const V8DOMConfiguration::AccessorConfiguration accessor{{attribute.name}}Configuration = {{attribute_configuration(attribute)}};
   V8DOMConfiguration::installAccessor(isolate, world, instance, prototype, interface, signature, accessor{{attribute.name}}Configuration);
@@ -421,16 +423,16 @@ void {{v8_class_or_partial}}::install{{origin_trial_feature.name}}(v8::Isolate*
   {% endfor %}
 }
 
-void {{v8_class_or_partial}}::install{{origin_trial_feature.name}}(ScriptState* scriptState, v8::Local<v8::Object> instance) {
+void {{v8_class_or_partial}}::install{{origin_trial_feature.name}}(const ScriptState* scriptState, v8::Local<v8::Object> instance) {
   V8PerContextData* perContextData = V8PerContextData::from(scriptState->context());
   v8::Local<v8::Object> prototype = perContextData->prototypeForType(&{{v8_class}}::wrapperTypeInfo);
   v8::Local<v8::Function> interface = perContextData->constructorForType(&{{v8_class}}::wrapperTypeInfo);
   ALLOW_UNUSED_LOCAL(interface);
-  install{{origin_trial_feature.name}}(scriptState->isolate(), scriptState->world(), instance, prototype, interface);
+  install{{origin_trial_feature.name}}(scriptState, instance, prototype, interface);
 }
 {% if not origin_trial_feature.needs_instance %}
 
-void {{v8_class_or_partial}}::install{{origin_trial_feature.name}}(ScriptState* scriptState) {
+void {{v8_class_or_partial}}::install{{origin_trial_feature.name}}(const ScriptState* scriptState) {
   install{{origin_trial_feature.name}}(scriptState, v8::Local<v8::Object>());
 }
 {% endif %}